diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml deleted file mode 100644 index 5cc17399d83..00000000000 --- a/.github/workflows/clang-format-check.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Clang Format Check - -on: pull_request - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Install clang-format - run: sudo apt-get install clang-format-10 - - name: Run clang-format-check - run: sh tools/clang-format-check.sh - \ No newline at end of file diff --git a/Makefile b/Makefile index dd11eceada4..09b47c4ab73 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ ASFLAGS := -mgekko -I include LDFLAGS := -unused -map $(MAP) -fp hard -nodefaults -w off # Compiler flags -CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES) +CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES) # elf2dol needs to know these in order to calculate sbss correctly. SDATA_PDHR := 9 diff --git a/asm/JSystem/J2DGraph/J2DAnimation/__ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s b/asm/JSystem/J2DGraph/J2DAnimation/__ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s deleted file mode 100644 index 77c34e65f93..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/__ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8030CB2C: -/* 8030CB2C 38 00 00 00 */ li r0, 0 -/* 8030CB30 90 03 00 00 */ stw r0, 0(r3) -/* 8030CB34 90 03 00 04 */ stw r0, 4(r3) -/* 8030CB38 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/__dt__15J2DAnmColorFullFv.s b/asm/JSystem/J2DGraph/J2DAnimation/__dt__15J2DAnmColorFullFv.s deleted file mode 100644 index fc3c0386b37..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/__dt__15J2DAnmColorFullFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8030CCF8: -/* 8030CCF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030CCFC 7C 08 02 A6 */ mflr r0 -/* 8030CD00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CD04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8030CD08 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8030CD0C 41 82 00 58 */ beq lbl_8030CD64 -/* 8030CD10 3C 60 80 3D */ lis r3, __vt__15J2DAnmColorFull@ha /* 0x803CD794@ha */ -/* 8030CD14 38 03 D7 94 */ addi r0, r3, __vt__15J2DAnmColorFull@l /* 0x803CD794@l */ -/* 8030CD18 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CD1C 41 82 00 38 */ beq lbl_8030CD54 -/* 8030CD20 3C 60 80 3D */ lis r3, __vt__11J2DAnmColor@ha /* 0x803CD7A8@ha */ -/* 8030CD24 38 03 D7 A8 */ addi r0, r3, __vt__11J2DAnmColor@l /* 0x803CD7A8@l */ -/* 8030CD28 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CD2C 34 1F 00 20 */ addic. r0, r31, 0x20 -/* 8030CD30 41 82 00 10 */ beq lbl_8030CD40 -/* 8030CD34 3C 60 80 3C */ lis r3, __vt__10JUTNameTab@ha /* 0x803BB3DC@ha */ -/* 8030CD38 38 03 B3 DC */ addi r0, r3, __vt__10JUTNameTab@l /* 0x803BB3DC@l */ -/* 8030CD3C 90 1F 00 20 */ stw r0, 0x20(r31) -lbl_8030CD40: -/* 8030CD40 28 1F 00 00 */ cmplwi r31, 0 -/* 8030CD44 41 82 00 10 */ beq lbl_8030CD54 -/* 8030CD48 3C 60 80 3B */ lis r3, __vt__10J2DAnmBase@ha /* 0x803A8E04@ha */ -/* 8030CD4C 38 03 8E 04 */ addi r0, r3, __vt__10J2DAnmBase@l /* 0x803A8E04@l */ -/* 8030CD50 90 1F 00 00 */ stw r0, 0(r31) -lbl_8030CD54: -/* 8030CD54 7C 80 07 35 */ extsh. r0, r4 -/* 8030CD58 40 81 00 0C */ ble lbl_8030CD64 -/* 8030CD5C 7F E3 FB 78 */ mr r3, r31 -/* 8030CD60 4B FC 1F DD */ bl __dl__FPv -lbl_8030CD64: -/* 8030CD64 7F E3 FB 78 */ mr r3, r31 -/* 8030CD68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8030CD6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030CD70 7C 08 03 A6 */ mtlr r0 -/* 8030CD74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CD78 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/__dt__16J2DAnmTexPatternFv.s b/asm/JSystem/J2DGraph/J2DAnimation/__dt__16J2DAnmTexPatternFv.s deleted file mode 100644 index 0b135ecd5cd..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/__dt__16J2DAnmTexPatternFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8030CB90: -/* 8030CB90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030CB94 7C 08 02 A6 */ mflr r0 -/* 8030CB98 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CB9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8030CBA0 93 C1 00 08 */ stw r30, 8(r1) -/* 8030CBA4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8030CBA8 7C 9F 23 78 */ mr r31, r4 -/* 8030CBAC 41 82 00 58 */ beq lbl_8030CC04 -/* 8030CBB0 3C 60 80 3D */ lis r3, __vt__16J2DAnmTexPattern@ha /* 0x803CD738@ha */ -/* 8030CBB4 38 03 D7 38 */ addi r0, r3, __vt__16J2DAnmTexPattern@l /* 0x803CD738@l */ -/* 8030CBB8 90 1E 00 00 */ stw r0, 0(r30) -/* 8030CBBC 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 8030CBC0 3C 80 80 31 */ lis r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha /* 0x8030CB3C@ha */ -/* 8030CBC4 38 84 CB 3C */ addi r4, r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l /* 0x8030CB3C@l */ -/* 8030CBC8 48 05 50 A5 */ bl __destroy_new_array -/* 8030CBCC 34 1E 00 20 */ addic. r0, r30, 0x20 -/* 8030CBD0 41 82 00 10 */ beq lbl_8030CBE0 -/* 8030CBD4 3C 60 80 3C */ lis r3, __vt__10JUTNameTab@ha /* 0x803BB3DC@ha */ -/* 8030CBD8 38 03 B3 DC */ addi r0, r3, __vt__10JUTNameTab@l /* 0x803BB3DC@l */ -/* 8030CBDC 90 1E 00 20 */ stw r0, 0x20(r30) -lbl_8030CBE0: -/* 8030CBE0 28 1E 00 00 */ cmplwi r30, 0 -/* 8030CBE4 41 82 00 10 */ beq lbl_8030CBF4 -/* 8030CBE8 3C 60 80 3B */ lis r3, __vt__10J2DAnmBase@ha /* 0x803A8E04@ha */ -/* 8030CBEC 38 03 8E 04 */ addi r0, r3, __vt__10J2DAnmBase@l /* 0x803A8E04@l */ -/* 8030CBF0 90 1E 00 00 */ stw r0, 0(r30) -lbl_8030CBF4: -/* 8030CBF4 7F E0 07 35 */ extsh. r0, r31 -/* 8030CBF8 40 81 00 0C */ ble lbl_8030CC04 -/* 8030CBFC 7F C3 F3 78 */ mr r3, r30 -/* 8030CC00 4B FC 21 3D */ bl __dl__FPv -lbl_8030CC04: -/* 8030CC04 7F C3 F3 78 */ mr r3, r30 -/* 8030CC08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8030CC0C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8030CC10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030CC14 7C 08 03 A6 */ mtlr r0 -/* 8030CC18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CC1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/__dt__17J2DAnmVtxColorKeyFv.s b/asm/JSystem/J2DGraph/J2DAnimation/__dt__17J2DAnmVtxColorKeyFv.s deleted file mode 100644 index e02935aec7f..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/__dt__17J2DAnmVtxColorKeyFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8030CC20: -/* 8030CC20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030CC24 7C 08 02 A6 */ mflr r0 -/* 8030CC28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CC2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8030CC30 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8030CC34 41 82 00 40 */ beq lbl_8030CC74 -/* 8030CC38 3C 60 80 3D */ lis r3, __vt__17J2DAnmVtxColorKey@ha /* 0x803CD758@ha */ -/* 8030CC3C 38 03 D7 58 */ addi r0, r3, __vt__17J2DAnmVtxColorKey@l /* 0x803CD758@l */ -/* 8030CC40 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CC44 41 82 00 20 */ beq lbl_8030CC64 -/* 8030CC48 3C 60 80 3D */ lis r3, __vt__14J2DAnmVtxColor@ha /* 0x803CD714@ha */ -/* 8030CC4C 38 03 D7 14 */ addi r0, r3, __vt__14J2DAnmVtxColor@l /* 0x803CD714@l */ -/* 8030CC50 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CC54 41 82 00 10 */ beq lbl_8030CC64 -/* 8030CC58 3C 60 80 3B */ lis r3, __vt__10J2DAnmBase@ha /* 0x803A8E04@ha */ -/* 8030CC5C 38 03 8E 04 */ addi r0, r3, __vt__10J2DAnmBase@l /* 0x803A8E04@l */ -/* 8030CC60 90 1F 00 00 */ stw r0, 0(r31) -lbl_8030CC64: -/* 8030CC64 7C 80 07 35 */ extsh. r0, r4 -/* 8030CC68 40 81 00 0C */ ble lbl_8030CC74 -/* 8030CC6C 7F E3 FB 78 */ mr r3, r31 -/* 8030CC70 4B FC 20 CD */ bl __dl__FPv -lbl_8030CC74: -/* 8030CC74 7F E3 FB 78 */ mr r3, r31 -/* 8030CC78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8030CC7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030CC80 7C 08 03 A6 */ mtlr r0 -/* 8030CC84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CC88 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/__dt__18J2DAnmVtxColorFullFv.s b/asm/JSystem/J2DGraph/J2DAnimation/__dt__18J2DAnmVtxColorFullFv.s deleted file mode 100644 index 1dbfc497f2c..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/__dt__18J2DAnmVtxColorFullFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8030CC8C: -/* 8030CC8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030CC90 7C 08 02 A6 */ mflr r0 -/* 8030CC94 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CC98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8030CC9C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8030CCA0 41 82 00 40 */ beq lbl_8030CCE0 -/* 8030CCA4 3C 60 80 3D */ lis r3, __vt__18J2DAnmVtxColorFull@ha /* 0x803CD76C@ha */ -/* 8030CCA8 38 03 D7 6C */ addi r0, r3, __vt__18J2DAnmVtxColorFull@l /* 0x803CD76C@l */ -/* 8030CCAC 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CCB0 41 82 00 20 */ beq lbl_8030CCD0 -/* 8030CCB4 3C 60 80 3D */ lis r3, __vt__14J2DAnmVtxColor@ha /* 0x803CD714@ha */ -/* 8030CCB8 38 03 D7 14 */ addi r0, r3, __vt__14J2DAnmVtxColor@l /* 0x803CD714@l */ -/* 8030CCBC 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CCC0 41 82 00 10 */ beq lbl_8030CCD0 -/* 8030CCC4 3C 60 80 3B */ lis r3, __vt__10J2DAnmBase@ha /* 0x803A8E04@ha */ -/* 8030CCC8 38 03 8E 04 */ addi r0, r3, __vt__10J2DAnmBase@l /* 0x803A8E04@l */ -/* 8030CCCC 90 1F 00 00 */ stw r0, 0(r31) -lbl_8030CCD0: -/* 8030CCD0 7C 80 07 35 */ extsh. r0, r4 -/* 8030CCD4 40 81 00 0C */ ble lbl_8030CCE0 -/* 8030CCD8 7F E3 FB 78 */ mr r3, r31 -/* 8030CCDC 4B FC 20 61 */ bl __dl__FPv -lbl_8030CCE0: -/* 8030CCE0 7F E3 FB 78 */ mr r3, r31 -/* 8030CCE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8030CCE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030CCEC 7C 08 03 A6 */ mtlr r0 -/* 8030CCF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CCF4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/__dt__19J2DAnmTransformFullFv.s b/asm/JSystem/J2DGraph/J2DAnimation/__dt__19J2DAnmTransformFullFv.s deleted file mode 100644 index 9ba3acd7bdc..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/__dt__19J2DAnmTransformFullFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8030CDAC: -/* 8030CDAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030CDB0 7C 08 02 A6 */ mflr r0 -/* 8030CDB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CDB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8030CDBC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8030CDC0 41 82 00 40 */ beq lbl_8030CE00 -/* 8030CDC4 3C 60 80 3D */ lis r3, __vt__19J2DAnmTransformFull@ha /* 0x803CD7D4@ha */ -/* 8030CDC8 38 03 D7 D4 */ addi r0, r3, __vt__19J2DAnmTransformFull@l /* 0x803CD7D4@l */ -/* 8030CDCC 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CDD0 41 82 00 20 */ beq lbl_8030CDF0 -/* 8030CDD4 3C 60 80 3C */ lis r3, __vt__15J2DAnmTransform@ha /* 0x803BB3B8@ha */ -/* 8030CDD8 38 03 B3 B8 */ addi r0, r3, __vt__15J2DAnmTransform@l /* 0x803BB3B8@l */ -/* 8030CDDC 90 1F 00 00 */ stw r0, 0(r31) -/* 8030CDE0 41 82 00 10 */ beq lbl_8030CDF0 -/* 8030CDE4 3C 60 80 3B */ lis r3, __vt__10J2DAnmBase@ha /* 0x803A8E04@ha */ -/* 8030CDE8 38 03 8E 04 */ addi r0, r3, __vt__10J2DAnmBase@l /* 0x803A8E04@l */ -/* 8030CDEC 90 1F 00 00 */ stw r0, 0(r31) -lbl_8030CDF0: -/* 8030CDF0 7C 80 07 35 */ extsh. r0, r4 -/* 8030CDF4 40 81 00 0C */ ble lbl_8030CE00 -/* 8030CDF8 7F E3 FB 78 */ mr r3, r31 -/* 8030CDFC 4B FC 1F 41 */ bl __dl__FPv -lbl_8030CE00: -/* 8030CE00 7F E3 FB 78 */ mr r3, r31 -/* 8030CE04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8030CE08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030CE0C 7C 08 03 A6 */ mtlr r0 -/* 8030CE10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CE14 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/__dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s b/asm/JSystem/J2DGraph/J2DAnimation/__dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s deleted file mode 100644 index 58794dff4a3..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/__dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8030CB3C: -/* 8030CB3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030CB40 7C 08 02 A6 */ mflr r0 -/* 8030CB44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CB48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8030CB4C 93 C1 00 08 */ stw r30, 8(r1) -/* 8030CB50 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8030CB54 7C 9F 23 78 */ mr r31, r4 -/* 8030CB58 41 82 00 1C */ beq lbl_8030CB74 -/* 8030CB5C 80 7E 00 04 */ lwz r3, 4(r30) -/* 8030CB60 4B FC 21 DD */ bl __dl__FPv -/* 8030CB64 7F E0 07 35 */ extsh. r0, r31 -/* 8030CB68 40 81 00 0C */ ble lbl_8030CB74 -/* 8030CB6C 7F C3 F3 78 */ mr r3, r30 -/* 8030CB70 4B FC 21 CD */ bl __dl__FPv -lbl_8030CB74: -/* 8030CB74 7F C3 F3 78 */ mr r3, r30 -/* 8030CB78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8030CB7C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8030CB80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030CB84 7C 08 03 A6 */ mtlr r0 -/* 8030CB88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CB8C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo.s b/asm/JSystem/J2DGraph/J2DAnimation/calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo.s deleted file mode 100644 index a5c5dc05f48..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo.s +++ /dev/null @@ -1,303 +0,0 @@ -lbl_8030AAFC: -/* 8030AAFC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8030AB00 7C 08 02 A6 */ mflr r0 -/* 8030AB04 90 01 00 44 */ stw r0, 0x44(r1) -/* 8030AB08 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8030AB0C F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8030AB10 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030AB14 48 05 76 C1 */ bl _savegpr_27 -/* 8030AB18 7C 7B 1B 78 */ mr r27, r3 -/* 8030AB1C FF E0 08 90 */ fmr f31, f1 -/* 8030AB20 7C BC 2B 78 */ mr r28, r5 -/* 8030AB24 1C 04 00 03 */ mulli r0, r4, 3 -/* 8030AB28 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 8030AB2C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8030AB30 1C 04 00 12 */ mulli r0, r4, 0x12 -/* 8030AB34 7F E3 02 14 */ add r31, r3, r0 -/* 8030AB38 38 04 00 01 */ addi r0, r4, 1 -/* 8030AB3C 1C 00 00 12 */ mulli r0, r0, 0x12 -/* 8030AB40 7F C3 02 14 */ add r30, r3, r0 -/* 8030AB44 38 04 00 02 */ addi r0, r4, 2 -/* 8030AB48 1C 00 00 12 */ mulli r0, r0, 0x12 -/* 8030AB4C 7F A3 02 14 */ add r29, r3, r0 -/* 8030AB50 A0 1F 00 00 */ lhz r0, 0(r31) -/* 8030AB54 2C 00 00 01 */ cmpwi r0, 1 -/* 8030AB58 41 82 00 20 */ beq lbl_8030AB78 -/* 8030AB5C 40 80 00 34 */ bge lbl_8030AB90 -/* 8030AB60 2C 00 00 00 */ cmpwi r0, 0 -/* 8030AB64 40 80 00 08 */ bge lbl_8030AB6C -/* 8030AB68 48 00 00 28 */ b lbl_8030AB90 -lbl_8030AB6C: -/* 8030AB6C C0 02 C9 10 */ lfs f0, lit_1619(r2) -/* 8030AB70 D0 1C 00 00 */ stfs f0, 0(r28) -/* 8030AB74 48 00 00 3C */ b lbl_8030ABB0 -lbl_8030AB78: -/* 8030AB78 80 7B 00 10 */ lwz r3, 0x10(r27) -/* 8030AB7C A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030AB80 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AB84 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030AB88 D0 1C 00 00 */ stfs f0, 0(r28) -/* 8030AB8C 48 00 00 24 */ b lbl_8030ABB0 -lbl_8030AB90: -/* 8030AB90 FC 20 F8 90 */ fmr f1, f31 -/* 8030AB94 7F E3 FB 78 */ mr r3, r31 -/* 8030AB98 80 9B 00 10 */ lwz r4, 0x10(r27) -/* 8030AB9C A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030ABA0 54 00 10 3A */ slwi r0, r0, 2 -/* 8030ABA4 7C 84 02 14 */ add r4, r4, r0 -/* 8030ABA8 48 00 1E 09 */ bl func_8030C9B0 -/* 8030ABAC D0 3C 00 00 */ stfs f1, 0(r28) -lbl_8030ABB0: -/* 8030ABB0 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8030ABB4 2C 00 00 01 */ cmpwi r0, 1 -/* 8030ABB8 41 82 00 20 */ beq lbl_8030ABD8 -/* 8030ABBC 40 80 00 34 */ bge lbl_8030ABF0 -/* 8030ABC0 2C 00 00 00 */ cmpwi r0, 0 -/* 8030ABC4 40 80 00 08 */ bge lbl_8030ABCC -/* 8030ABC8 48 00 00 28 */ b lbl_8030ABF0 -lbl_8030ABCC: -/* 8030ABCC C0 02 C9 10 */ lfs f0, lit_1619(r2) -/* 8030ABD0 D0 1C 00 04 */ stfs f0, 4(r28) -/* 8030ABD4 48 00 00 3C */ b lbl_8030AC10 -lbl_8030ABD8: -/* 8030ABD8 80 7B 00 10 */ lwz r3, 0x10(r27) -/* 8030ABDC A0 1E 00 02 */ lhz r0, 2(r30) -/* 8030ABE0 54 00 10 3A */ slwi r0, r0, 2 -/* 8030ABE4 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030ABE8 D0 1C 00 04 */ stfs f0, 4(r28) -/* 8030ABEC 48 00 00 24 */ b lbl_8030AC10 -lbl_8030ABF0: -/* 8030ABF0 FC 20 F8 90 */ fmr f1, f31 -/* 8030ABF4 7F C3 F3 78 */ mr r3, r30 -/* 8030ABF8 80 9B 00 10 */ lwz r4, 0x10(r27) -/* 8030ABFC A0 1E 00 02 */ lhz r0, 2(r30) -/* 8030AC00 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AC04 7C 84 02 14 */ add r4, r4, r0 -/* 8030AC08 48 00 1D A9 */ bl func_8030C9B0 -/* 8030AC0C D0 3C 00 04 */ stfs f1, 4(r28) -lbl_8030AC10: -/* 8030AC10 A0 1D 00 00 */ lhz r0, 0(r29) -/* 8030AC14 2C 00 00 01 */ cmpwi r0, 1 -/* 8030AC18 41 82 00 20 */ beq lbl_8030AC38 -/* 8030AC1C 40 80 00 34 */ bge lbl_8030AC50 -/* 8030AC20 2C 00 00 00 */ cmpwi r0, 0 -/* 8030AC24 40 80 00 08 */ bge lbl_8030AC2C -/* 8030AC28 48 00 00 28 */ b lbl_8030AC50 -lbl_8030AC2C: -/* 8030AC2C C0 02 C9 10 */ lfs f0, lit_1619(r2) -/* 8030AC30 D0 1C 00 08 */ stfs f0, 8(r28) -/* 8030AC34 48 00 00 3C */ b lbl_8030AC70 -lbl_8030AC38: -/* 8030AC38 80 7B 00 10 */ lwz r3, 0x10(r27) -/* 8030AC3C A0 1D 00 02 */ lhz r0, 2(r29) -/* 8030AC40 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AC44 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030AC48 D0 1C 00 08 */ stfs f0, 8(r28) -/* 8030AC4C 48 00 00 24 */ b lbl_8030AC70 -lbl_8030AC50: -/* 8030AC50 FC 20 F8 90 */ fmr f1, f31 -/* 8030AC54 7F A3 EB 78 */ mr r3, r29 -/* 8030AC58 80 9B 00 10 */ lwz r4, 0x10(r27) -/* 8030AC5C A0 1D 00 02 */ lhz r0, 2(r29) -/* 8030AC60 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AC64 7C 84 02 14 */ add r4, r4, r0 -/* 8030AC68 48 00 1D 49 */ bl func_8030C9B0 -/* 8030AC6C D0 3C 00 08 */ stfs f1, 8(r28) -lbl_8030AC70: -/* 8030AC70 A0 1F 00 06 */ lhz r0, 6(r31) -/* 8030AC74 2C 00 00 01 */ cmpwi r0, 1 -/* 8030AC78 41 82 00 20 */ beq lbl_8030AC98 -/* 8030AC7C 40 80 00 3C */ bge lbl_8030ACB8 -/* 8030AC80 2C 00 00 00 */ cmpwi r0, 0 -/* 8030AC84 40 80 00 08 */ bge lbl_8030AC8C -/* 8030AC88 48 00 00 30 */ b lbl_8030ACB8 -lbl_8030AC8C: -/* 8030AC8C 38 00 00 00 */ li r0, 0 -/* 8030AC90 B0 1C 00 0C */ sth r0, 0xc(r28) -/* 8030AC94 48 00 00 58 */ b lbl_8030ACEC -lbl_8030AC98: -/* 8030AC98 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 8030AC9C A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030ACA0 54 00 08 3C */ slwi r0, r0, 1 -/* 8030ACA4 7C 63 02 AE */ lhax r3, r3, r0 -/* 8030ACA8 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 8030ACAC 7C 60 00 30 */ slw r0, r3, r0 -/* 8030ACB0 B0 1C 00 0C */ sth r0, 0xc(r28) -/* 8030ACB4 48 00 00 38 */ b lbl_8030ACEC -lbl_8030ACB8: -/* 8030ACB8 FC 20 F8 90 */ fmr f1, f31 -/* 8030ACBC 38 7F 00 06 */ addi r3, r31, 6 -/* 8030ACC0 80 9B 00 14 */ lwz r4, 0x14(r27) -/* 8030ACC4 A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030ACC8 54 00 08 3C */ slwi r0, r0, 1 -/* 8030ACCC 7C 84 02 14 */ add r4, r4, r0 -/* 8030ACD0 48 00 1A AD */ bl func_8030C77C -/* 8030ACD4 FC 00 08 1E */ fctiwz f0, f1 -/* 8030ACD8 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030ACDC 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8030ACE0 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 8030ACE4 7C 60 00 30 */ slw r0, r3, r0 -/* 8030ACE8 B0 1C 00 0C */ sth r0, 0xc(r28) -lbl_8030ACEC: -/* 8030ACEC A0 1E 00 06 */ lhz r0, 6(r30) -/* 8030ACF0 2C 00 00 01 */ cmpwi r0, 1 -/* 8030ACF4 41 82 00 20 */ beq lbl_8030AD14 -/* 8030ACF8 40 80 00 3C */ bge lbl_8030AD34 -/* 8030ACFC 2C 00 00 00 */ cmpwi r0, 0 -/* 8030AD00 40 80 00 08 */ bge lbl_8030AD08 -/* 8030AD04 48 00 00 30 */ b lbl_8030AD34 -lbl_8030AD08: -/* 8030AD08 38 00 00 00 */ li r0, 0 -/* 8030AD0C B0 1C 00 0E */ sth r0, 0xe(r28) -/* 8030AD10 48 00 00 58 */ b lbl_8030AD68 -lbl_8030AD14: -/* 8030AD14 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 8030AD18 A0 1E 00 08 */ lhz r0, 8(r30) -/* 8030AD1C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030AD20 7C 63 02 AE */ lhax r3, r3, r0 -/* 8030AD24 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 8030AD28 7C 60 00 30 */ slw r0, r3, r0 -/* 8030AD2C B0 1C 00 0E */ sth r0, 0xe(r28) -/* 8030AD30 48 00 00 38 */ b lbl_8030AD68 -lbl_8030AD34: -/* 8030AD34 FC 20 F8 90 */ fmr f1, f31 -/* 8030AD38 38 7E 00 06 */ addi r3, r30, 6 -/* 8030AD3C 80 9B 00 14 */ lwz r4, 0x14(r27) -/* 8030AD40 A0 1E 00 08 */ lhz r0, 8(r30) -/* 8030AD44 54 00 08 3C */ slwi r0, r0, 1 -/* 8030AD48 7C 84 02 14 */ add r4, r4, r0 -/* 8030AD4C 48 00 1A 31 */ bl func_8030C77C -/* 8030AD50 FC 00 08 1E */ fctiwz f0, f1 -/* 8030AD54 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030AD58 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8030AD5C 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 8030AD60 7C 60 00 30 */ slw r0, r3, r0 -/* 8030AD64 B0 1C 00 0E */ sth r0, 0xe(r28) -lbl_8030AD68: -/* 8030AD68 A0 1D 00 06 */ lhz r0, 6(r29) -/* 8030AD6C 2C 00 00 01 */ cmpwi r0, 1 -/* 8030AD70 41 82 00 20 */ beq lbl_8030AD90 -/* 8030AD74 40 80 00 3C */ bge lbl_8030ADB0 -/* 8030AD78 2C 00 00 00 */ cmpwi r0, 0 -/* 8030AD7C 40 80 00 08 */ bge lbl_8030AD84 -/* 8030AD80 48 00 00 30 */ b lbl_8030ADB0 -lbl_8030AD84: -/* 8030AD84 38 00 00 00 */ li r0, 0 -/* 8030AD88 B0 1C 00 10 */ sth r0, 0x10(r28) -/* 8030AD8C 48 00 00 58 */ b lbl_8030ADE4 -lbl_8030AD90: -/* 8030AD90 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 8030AD94 A0 1D 00 08 */ lhz r0, 8(r29) -/* 8030AD98 54 00 08 3C */ slwi r0, r0, 1 -/* 8030AD9C 7C 63 02 AE */ lhax r3, r3, r0 -/* 8030ADA0 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 8030ADA4 7C 60 00 30 */ slw r0, r3, r0 -/* 8030ADA8 B0 1C 00 10 */ sth r0, 0x10(r28) -/* 8030ADAC 48 00 00 38 */ b lbl_8030ADE4 -lbl_8030ADB0: -/* 8030ADB0 FC 20 F8 90 */ fmr f1, f31 -/* 8030ADB4 38 7D 00 06 */ addi r3, r29, 6 -/* 8030ADB8 80 9B 00 14 */ lwz r4, 0x14(r27) -/* 8030ADBC A0 1D 00 08 */ lhz r0, 8(r29) -/* 8030ADC0 54 00 08 3C */ slwi r0, r0, 1 -/* 8030ADC4 7C 84 02 14 */ add r4, r4, r0 -/* 8030ADC8 48 00 19 B5 */ bl func_8030C77C -/* 8030ADCC FC 00 08 1E */ fctiwz f0, f1 -/* 8030ADD0 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030ADD4 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8030ADD8 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 8030ADDC 7C 60 00 30 */ slw r0, r3, r0 -/* 8030ADE0 B0 1C 00 10 */ sth r0, 0x10(r28) -lbl_8030ADE4: -/* 8030ADE4 A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8030ADE8 2C 00 00 01 */ cmpwi r0, 1 -/* 8030ADEC 41 82 00 20 */ beq lbl_8030AE0C -/* 8030ADF0 40 80 00 34 */ bge lbl_8030AE24 -/* 8030ADF4 2C 00 00 00 */ cmpwi r0, 0 -/* 8030ADF8 40 80 00 08 */ bge lbl_8030AE00 -/* 8030ADFC 48 00 00 28 */ b lbl_8030AE24 -lbl_8030AE00: -/* 8030AE00 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030AE04 D0 1C 00 14 */ stfs f0, 0x14(r28) -/* 8030AE08 48 00 00 3C */ b lbl_8030AE44 -lbl_8030AE0C: -/* 8030AE0C 80 7B 00 18 */ lwz r3, 0x18(r27) -/* 8030AE10 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030AE14 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AE18 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030AE1C D0 1C 00 14 */ stfs f0, 0x14(r28) -/* 8030AE20 48 00 00 24 */ b lbl_8030AE44 -lbl_8030AE24: -/* 8030AE24 FC 20 F8 90 */ fmr f1, f31 -/* 8030AE28 38 7F 00 0C */ addi r3, r31, 0xc -/* 8030AE2C 80 9B 00 18 */ lwz r4, 0x18(r27) -/* 8030AE30 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030AE34 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AE38 7C 84 02 14 */ add r4, r4, r0 -/* 8030AE3C 48 00 1B 75 */ bl func_8030C9B0 -/* 8030AE40 D0 3C 00 14 */ stfs f1, 0x14(r28) -lbl_8030AE44: -/* 8030AE44 A0 1E 00 0C */ lhz r0, 0xc(r30) -/* 8030AE48 2C 00 00 01 */ cmpwi r0, 1 -/* 8030AE4C 41 82 00 20 */ beq lbl_8030AE6C -/* 8030AE50 40 80 00 34 */ bge lbl_8030AE84 -/* 8030AE54 2C 00 00 00 */ cmpwi r0, 0 -/* 8030AE58 40 80 00 08 */ bge lbl_8030AE60 -/* 8030AE5C 48 00 00 28 */ b lbl_8030AE84 -lbl_8030AE60: -/* 8030AE60 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030AE64 D0 1C 00 18 */ stfs f0, 0x18(r28) -/* 8030AE68 48 00 00 3C */ b lbl_8030AEA4 -lbl_8030AE6C: -/* 8030AE6C 80 7B 00 18 */ lwz r3, 0x18(r27) -/* 8030AE70 A0 1E 00 0E */ lhz r0, 0xe(r30) -/* 8030AE74 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AE78 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030AE7C D0 1C 00 18 */ stfs f0, 0x18(r28) -/* 8030AE80 48 00 00 24 */ b lbl_8030AEA4 -lbl_8030AE84: -/* 8030AE84 FC 20 F8 90 */ fmr f1, f31 -/* 8030AE88 38 7E 00 0C */ addi r3, r30, 0xc -/* 8030AE8C 80 9B 00 18 */ lwz r4, 0x18(r27) -/* 8030AE90 A0 1E 00 0E */ lhz r0, 0xe(r30) -/* 8030AE94 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AE98 7C 84 02 14 */ add r4, r4, r0 -/* 8030AE9C 48 00 1B 15 */ bl func_8030C9B0 -/* 8030AEA0 D0 3C 00 18 */ stfs f1, 0x18(r28) -lbl_8030AEA4: -/* 8030AEA4 A0 1D 00 0C */ lhz r0, 0xc(r29) -/* 8030AEA8 2C 00 00 01 */ cmpwi r0, 1 -/* 8030AEAC 41 82 00 20 */ beq lbl_8030AECC -/* 8030AEB0 40 80 00 34 */ bge lbl_8030AEE4 -/* 8030AEB4 2C 00 00 00 */ cmpwi r0, 0 -/* 8030AEB8 40 80 00 08 */ bge lbl_8030AEC0 -/* 8030AEBC 48 00 00 28 */ b lbl_8030AEE4 -lbl_8030AEC0: -/* 8030AEC0 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030AEC4 D0 1C 00 1C */ stfs f0, 0x1c(r28) -/* 8030AEC8 48 00 00 3C */ b lbl_8030AF04 -lbl_8030AECC: -/* 8030AECC 80 7B 00 18 */ lwz r3, 0x18(r27) -/* 8030AED0 A0 1D 00 0E */ lhz r0, 0xe(r29) -/* 8030AED4 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AED8 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030AEDC D0 1C 00 1C */ stfs f0, 0x1c(r28) -/* 8030AEE0 48 00 00 24 */ b lbl_8030AF04 -lbl_8030AEE4: -/* 8030AEE4 FC 20 F8 90 */ fmr f1, f31 -/* 8030AEE8 38 7D 00 0C */ addi r3, r29, 0xc -/* 8030AEEC 80 9B 00 18 */ lwz r4, 0x18(r27) -/* 8030AEF0 A0 1D 00 0E */ lhz r0, 0xe(r29) -/* 8030AEF4 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AEF8 7C 84 02 14 */ add r4, r4, r0 -/* 8030AEFC 48 00 1A B5 */ bl func_8030C9B0 -/* 8030AF00 D0 3C 00 1C */ stfs f1, 0x1c(r28) -lbl_8030AF04: -/* 8030AF04 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8030AF08 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8030AF0C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030AF10 48 05 73 11 */ bl _restgpr_27 -/* 8030AF14 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030AF18 7C 08 03 A6 */ mtlr r0 -/* 8030AF1C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030AF20 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo.s b/asm/JSystem/J2DGraph/J2DAnimation/calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo.s deleted file mode 100644 index 9009269a8e1..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo.s +++ /dev/null @@ -1,177 +0,0 @@ -lbl_8030B9F0: -/* 8030B9F0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8030B9F4 7C 08 02 A6 */ mflr r0 -/* 8030B9F8 90 01 00 44 */ stw r0, 0x44(r1) -/* 8030B9FC DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8030BA00 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8030BA04 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030BA08 48 05 67 CD */ bl _savegpr_27 -/* 8030BA0C 7C 7B 1B 78 */ mr r27, r3 -/* 8030BA10 FF E0 08 90 */ fmr f31, f1 -/* 8030BA14 7C BC 2B 78 */ mr r28, r5 -/* 8030BA18 1C 04 00 03 */ mulli r0, r4, 3 -/* 8030BA1C 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 8030BA20 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8030BA24 1C 04 00 12 */ mulli r0, r4, 0x12 -/* 8030BA28 7F E3 02 14 */ add r31, r3, r0 -/* 8030BA2C 38 04 00 01 */ addi r0, r4, 1 -/* 8030BA30 1C 00 00 12 */ mulli r0, r0, 0x12 -/* 8030BA34 7F C3 02 14 */ add r30, r3, r0 -/* 8030BA38 38 04 00 02 */ addi r0, r4, 2 -/* 8030BA3C 1C 00 00 12 */ mulli r0, r0, 0x12 -/* 8030BA40 7F A3 02 14 */ add r29, r3, r0 -/* 8030BA44 A0 1F 00 00 */ lhz r0, 0(r31) -/* 8030BA48 2C 00 00 01 */ cmpwi r0, 1 -/* 8030BA4C 41 82 00 20 */ beq lbl_8030BA6C -/* 8030BA50 40 80 00 34 */ bge lbl_8030BA84 -/* 8030BA54 2C 00 00 00 */ cmpwi r0, 0 -/* 8030BA58 40 80 00 08 */ bge lbl_8030BA60 -/* 8030BA5C 48 00 00 28 */ b lbl_8030BA84 -lbl_8030BA60: -/* 8030BA60 C0 02 C9 10 */ lfs f0, lit_1619(r2) -/* 8030BA64 D0 1C 00 00 */ stfs f0, 0(r28) -/* 8030BA68 48 00 00 3C */ b lbl_8030BAA4 -lbl_8030BA6C: -/* 8030BA6C 80 7B 00 20 */ lwz r3, 0x20(r27) -/* 8030BA70 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030BA74 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BA78 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030BA7C D0 1C 00 00 */ stfs f0, 0(r28) -/* 8030BA80 48 00 00 24 */ b lbl_8030BAA4 -lbl_8030BA84: -/* 8030BA84 FC 20 F8 90 */ fmr f1, f31 -/* 8030BA88 7F E3 FB 78 */ mr r3, r31 -/* 8030BA8C 80 9B 00 20 */ lwz r4, 0x20(r27) -/* 8030BA90 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030BA94 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BA98 7C 84 02 14 */ add r4, r4, r0 -/* 8030BA9C 48 00 0F 15 */ bl func_8030C9B0 -/* 8030BAA0 D0 3C 00 00 */ stfs f1, 0(r28) -lbl_8030BAA4: -/* 8030BAA4 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8030BAA8 2C 00 00 01 */ cmpwi r0, 1 -/* 8030BAAC 41 82 00 20 */ beq lbl_8030BACC -/* 8030BAB0 40 80 00 34 */ bge lbl_8030BAE4 -/* 8030BAB4 2C 00 00 00 */ cmpwi r0, 0 -/* 8030BAB8 40 80 00 08 */ bge lbl_8030BAC0 -/* 8030BABC 48 00 00 28 */ b lbl_8030BAE4 -lbl_8030BAC0: -/* 8030BAC0 C0 02 C9 10 */ lfs f0, lit_1619(r2) -/* 8030BAC4 D0 1C 00 04 */ stfs f0, 4(r28) -/* 8030BAC8 48 00 00 3C */ b lbl_8030BB04 -lbl_8030BACC: -/* 8030BACC 80 7B 00 20 */ lwz r3, 0x20(r27) -/* 8030BAD0 A0 1E 00 02 */ lhz r0, 2(r30) -/* 8030BAD4 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BAD8 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030BADC D0 1C 00 04 */ stfs f0, 4(r28) -/* 8030BAE0 48 00 00 24 */ b lbl_8030BB04 -lbl_8030BAE4: -/* 8030BAE4 FC 20 F8 90 */ fmr f1, f31 -/* 8030BAE8 7F C3 F3 78 */ mr r3, r30 -/* 8030BAEC 80 9B 00 20 */ lwz r4, 0x20(r27) -/* 8030BAF0 A0 1E 00 02 */ lhz r0, 2(r30) -/* 8030BAF4 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BAF8 7C 84 02 14 */ add r4, r4, r0 -/* 8030BAFC 48 00 0E B5 */ bl func_8030C9B0 -/* 8030BB00 D0 3C 00 04 */ stfs f1, 4(r28) -lbl_8030BB04: -/* 8030BB04 A0 1D 00 06 */ lhz r0, 6(r29) -/* 8030BB08 2C 00 00 01 */ cmpwi r0, 1 -/* 8030BB0C 41 82 00 20 */ beq lbl_8030BB2C -/* 8030BB10 40 80 00 3C */ bge lbl_8030BB4C -/* 8030BB14 2C 00 00 00 */ cmpwi r0, 0 -/* 8030BB18 40 80 00 08 */ bge lbl_8030BB20 -/* 8030BB1C 48 00 00 30 */ b lbl_8030BB4C -lbl_8030BB20: -/* 8030BB20 38 00 00 00 */ li r0, 0 -/* 8030BB24 B0 1C 00 08 */ sth r0, 8(r28) -/* 8030BB28 48 00 00 58 */ b lbl_8030BB80 -lbl_8030BB2C: -/* 8030BB2C 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 8030BB30 A0 1D 00 08 */ lhz r0, 8(r29) -/* 8030BB34 54 00 08 3C */ slwi r0, r0, 1 -/* 8030BB38 7C 63 02 AE */ lhax r3, r3, r0 -/* 8030BB3C 80 1B 00 10 */ lwz r0, 0x10(r27) -/* 8030BB40 7C 60 00 30 */ slw r0, r3, r0 -/* 8030BB44 B0 1C 00 08 */ sth r0, 8(r28) -/* 8030BB48 48 00 00 38 */ b lbl_8030BB80 -lbl_8030BB4C: -/* 8030BB4C FC 20 F8 90 */ fmr f1, f31 -/* 8030BB50 38 7D 00 06 */ addi r3, r29, 6 -/* 8030BB54 80 9B 00 24 */ lwz r4, 0x24(r27) -/* 8030BB58 A0 1D 00 08 */ lhz r0, 8(r29) -/* 8030BB5C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030BB60 7C 84 02 14 */ add r4, r4, r0 -/* 8030BB64 48 00 0C 19 */ bl func_8030C77C -/* 8030BB68 FC 00 08 1E */ fctiwz f0, f1 -/* 8030BB6C D8 01 00 08 */ stfd f0, 8(r1) -/* 8030BB70 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8030BB74 80 1B 00 10 */ lwz r0, 0x10(r27) -/* 8030BB78 7C 60 00 30 */ slw r0, r3, r0 -/* 8030BB7C B0 1C 00 08 */ sth r0, 8(r28) -lbl_8030BB80: -/* 8030BB80 A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8030BB84 2C 00 00 01 */ cmpwi r0, 1 -/* 8030BB88 41 82 00 20 */ beq lbl_8030BBA8 -/* 8030BB8C 40 80 00 34 */ bge lbl_8030BBC0 -/* 8030BB90 2C 00 00 00 */ cmpwi r0, 0 -/* 8030BB94 40 80 00 08 */ bge lbl_8030BB9C -/* 8030BB98 48 00 00 28 */ b lbl_8030BBC0 -lbl_8030BB9C: -/* 8030BB9C C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030BBA0 D0 1C 00 0C */ stfs f0, 0xc(r28) -/* 8030BBA4 48 00 00 3C */ b lbl_8030BBE0 -lbl_8030BBA8: -/* 8030BBA8 80 7B 00 28 */ lwz r3, 0x28(r27) -/* 8030BBAC A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030BBB0 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BBB4 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030BBB8 D0 1C 00 0C */ stfs f0, 0xc(r28) -/* 8030BBBC 48 00 00 24 */ b lbl_8030BBE0 -lbl_8030BBC0: -/* 8030BBC0 FC 20 F8 90 */ fmr f1, f31 -/* 8030BBC4 38 7F 00 0C */ addi r3, r31, 0xc -/* 8030BBC8 80 9B 00 28 */ lwz r4, 0x28(r27) -/* 8030BBCC A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030BBD0 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BBD4 7C 84 02 14 */ add r4, r4, r0 -/* 8030BBD8 48 00 0D D9 */ bl func_8030C9B0 -/* 8030BBDC D0 3C 00 0C */ stfs f1, 0xc(r28) -lbl_8030BBE0: -/* 8030BBE0 A0 1E 00 0C */ lhz r0, 0xc(r30) -/* 8030BBE4 2C 00 00 01 */ cmpwi r0, 1 -/* 8030BBE8 41 82 00 20 */ beq lbl_8030BC08 -/* 8030BBEC 40 80 00 34 */ bge lbl_8030BC20 -/* 8030BBF0 2C 00 00 00 */ cmpwi r0, 0 -/* 8030BBF4 40 80 00 08 */ bge lbl_8030BBFC -/* 8030BBF8 48 00 00 28 */ b lbl_8030BC20 -lbl_8030BBFC: -/* 8030BBFC C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030BC00 D0 1C 00 10 */ stfs f0, 0x10(r28) -/* 8030BC04 48 00 00 3C */ b lbl_8030BC40 -lbl_8030BC08: -/* 8030BC08 80 7B 00 28 */ lwz r3, 0x28(r27) -/* 8030BC0C A0 1E 00 0E */ lhz r0, 0xe(r30) -/* 8030BC10 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BC14 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030BC18 D0 1C 00 10 */ stfs f0, 0x10(r28) -/* 8030BC1C 48 00 00 24 */ b lbl_8030BC40 -lbl_8030BC20: -/* 8030BC20 FC 20 F8 90 */ fmr f1, f31 -/* 8030BC24 38 7E 00 0C */ addi r3, r30, 0xc -/* 8030BC28 80 9B 00 28 */ lwz r4, 0x28(r27) -/* 8030BC2C A0 1E 00 0E */ lhz r0, 0xe(r30) -/* 8030BC30 54 00 10 3A */ slwi r0, r0, 2 -/* 8030BC34 7C 84 02 14 */ add r4, r4, r0 -/* 8030BC38 48 00 0D 79 */ bl func_8030C9B0 -/* 8030BC3C D0 3C 00 10 */ stfs f1, 0x10(r28) -lbl_8030BC40: -/* 8030BC40 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8030BC44 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8030BC48 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030BC4C 48 05 65 D5 */ bl _restgpr_27 -/* 8030BC50 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030BC54 7C 08 03 A6 */ mtlr r0 -/* 8030BC58 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030BC5C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/func_8030C77C.s b/asm/JSystem/J2DGraph/J2DAnimation/func_8030C77C.s deleted file mode 100644 index c4b7e01f743..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/func_8030C77C.s +++ /dev/null @@ -1,151 +0,0 @@ -lbl_8030C77C: -/* 8030C77C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030C780 A8 04 00 00 */ lha r0, 0(r4) -/* 8030C784 C8 42 C9 20 */ lfd f2, lit_2379(r2) -/* 8030C788 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C78C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C790 3C A0 43 30 */ lis r5, 0x4330 -/* 8030C794 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C798 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C79C EC 00 10 28 */ fsubs f0, f0, f2 -/* 8030C7A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8030C7A4 40 80 00 20 */ bge lbl_8030C7C4 -/* 8030C7A8 A8 04 00 02 */ lha r0, 2(r4) -/* 8030C7AC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C7B0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C7B4 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C7B8 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C7BC EC 20 10 28 */ fsubs f1, f0, f2 -/* 8030C7C0 48 00 01 E8 */ b lbl_8030C9A8 -lbl_8030C7C4: -/* 8030C7C4 A0 03 00 04 */ lhz r0, 4(r3) -/* 8030C7C8 28 00 00 00 */ cmplwi r0, 0 -/* 8030C7CC 40 82 00 F4 */ bne lbl_8030C8C0 -/* 8030C7D0 A0 C3 00 00 */ lhz r6, 0(r3) -/* 8030C7D4 38 06 FF FF */ addi r0, r6, -1 -/* 8030C7D8 1C 60 00 06 */ mulli r3, r0, 6 -/* 8030C7DC 7C 04 1A AE */ lhax r0, r4, r3 -/* 8030C7E0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C7E4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C7E8 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C7EC C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C7F0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8030C7F4 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8030C7F8 4C 40 13 82 */ cror 2, 0, 2 -/* 8030C7FC 40 82 00 68 */ bne lbl_8030C864 -/* 8030C800 7C 64 1A 14 */ add r3, r4, r3 -/* 8030C804 A8 03 00 02 */ lha r0, 2(r3) -/* 8030C808 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C80C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C810 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C814 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C818 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8030C81C 48 00 01 8C */ b lbl_8030C9A8 -/* 8030C820 48 00 00 44 */ b lbl_8030C864 -lbl_8030C824: -/* 8030C824 54 C7 F8 7E */ srwi r7, r6, 1 -/* 8030C828 1C 07 00 03 */ mulli r0, r7, 3 -/* 8030C82C 54 03 08 3C */ slwi r3, r0, 1 -/* 8030C830 7C 04 1A AE */ lhax r0, r4, r3 -/* 8030C834 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C838 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C83C 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C840 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C844 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8030C848 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8030C84C 4C 41 13 82 */ cror 2, 1, 2 -/* 8030C850 40 82 00 10 */ bne lbl_8030C860 -/* 8030C854 7C 84 1A 14 */ add r4, r4, r3 -/* 8030C858 7C C7 30 50 */ subf r6, r7, r6 -/* 8030C85C 48 00 00 08 */ b lbl_8030C864 -lbl_8030C860: -/* 8030C860 7C E6 3B 78 */ mr r6, r7 -lbl_8030C864: -/* 8030C864 28 06 00 01 */ cmplwi r6, 1 -/* 8030C868 41 81 FF BC */ bgt lbl_8030C824 -/* 8030C86C E0 44 D0 00 */ psq_l f2, 0(r4), 1, 5 /* qr5 */ -/* 8030C870 E0 04 D0 06 */ psq_l f0, 6(r4), 1, 5 /* qr5 */ -/* 8030C874 E0 E4 D0 02 */ psq_l f7, 2(r4), 1, 5 /* qr5 */ -/* 8030C878 EC A0 10 28 */ fsubs f5, f0, f2 -/* 8030C87C E0 C4 D0 08 */ psq_l f6, 8(r4), 1, 5 /* qr5 */ -/* 8030C880 EC 61 10 28 */ fsubs f3, f1, f2 -/* 8030C884 E0 04 D0 0A */ psq_l f0, 10(r4), 1, 5 /* qr5 */ -/* 8030C888 EC 86 38 28 */ fsubs f4, f6, f7 -/* 8030C88C EC 63 28 24 */ fdivs f3, f3, f5 -/* 8030C890 E0 24 D0 04 */ psq_l f1, 4(r4), 1, 5 /* qr5 */ -/* 8030C894 EC 00 39 7A */ fmadds f0, f0, f5, f7 -/* 8030C898 EC 43 00 F2 */ fmuls f2, f3, f3 -/* 8030C89C EC 85 20 7C */ fnmsubs f4, f5, f1, f4 -/* 8030C8A0 EC 00 30 28 */ fsubs f0, f0, f6 -/* 8030C8A4 EC 00 20 28 */ fsubs f0, f0, f4 -/* 8030C8A8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8030C8AC EC 25 00 7A */ fmadds f1, f5, f1, f0 -/* 8030C8B0 EC 21 38 FA */ fmadds f1, f1, f3, f7 -/* 8030C8B4 EC 24 08 BA */ fmadds f1, f4, f2, f1 -/* 8030C8B8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8030C8BC 48 00 00 EC */ b lbl_8030C9A8 -lbl_8030C8C0: -/* 8030C8C0 A0 C3 00 00 */ lhz r6, 0(r3) -/* 8030C8C4 38 06 FF FF */ addi r0, r6, -1 -/* 8030C8C8 54 03 18 38 */ slwi r3, r0, 3 -/* 8030C8CC 7C 04 1A AE */ lhax r0, r4, r3 -/* 8030C8D0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C8D4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C8D8 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C8DC C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C8E0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8030C8E4 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8030C8E8 4C 40 13 82 */ cror 2, 0, 2 -/* 8030C8EC 40 82 00 64 */ bne lbl_8030C950 -/* 8030C8F0 7C 64 1A 14 */ add r3, r4, r3 -/* 8030C8F4 A8 03 00 02 */ lha r0, 2(r3) -/* 8030C8F8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C8FC 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C900 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C904 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C908 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8030C90C 48 00 00 9C */ b lbl_8030C9A8 -/* 8030C910 48 00 00 40 */ b lbl_8030C950 -lbl_8030C914: -/* 8030C914 54 C7 F8 7E */ srwi r7, r6, 1 -/* 8030C918 54 C3 10 38 */ rlwinm r3, r6, 2, 0, 0x1c -/* 8030C91C 7C 04 1A AE */ lhax r0, r4, r3 -/* 8030C920 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030C924 90 01 00 0C */ stw r0, 0xc(r1) -/* 8030C928 90 A1 00 08 */ stw r5, 8(r1) -/* 8030C92C C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C930 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8030C934 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8030C938 4C 41 13 82 */ cror 2, 1, 2 -/* 8030C93C 40 82 00 10 */ bne lbl_8030C94C -/* 8030C940 7C 84 1A 14 */ add r4, r4, r3 -/* 8030C944 7C C7 30 50 */ subf r6, r7, r6 -/* 8030C948 48 00 00 08 */ b lbl_8030C950 -lbl_8030C94C: -/* 8030C94C 7C E6 3B 78 */ mr r6, r7 -lbl_8030C950: -/* 8030C950 28 06 00 01 */ cmplwi r6, 1 -/* 8030C954 41 81 FF C0 */ bgt lbl_8030C914 -/* 8030C958 E0 44 D0 00 */ psq_l f2, 0(r4), 1, 5 /* qr5 */ -/* 8030C95C E0 04 D0 08 */ psq_l f0, 8(r4), 1, 5 /* qr5 */ -/* 8030C960 E0 E4 D0 02 */ psq_l f7, 2(r4), 1, 5 /* qr5 */ -/* 8030C964 EC A0 10 28 */ fsubs f5, f0, f2 -/* 8030C968 E0 C4 D0 0A */ psq_l f6, 10(r4), 1, 5 /* qr5 */ -/* 8030C96C EC 61 10 28 */ fsubs f3, f1, f2 -/* 8030C970 E0 04 D0 0C */ psq_l f0, 12(r4), 1, 5 /* qr5 */ -/* 8030C974 EC 86 38 28 */ fsubs f4, f6, f7 -/* 8030C978 EC 63 28 24 */ fdivs f3, f3, f5 -/* 8030C97C E0 24 D0 06 */ psq_l f1, 6(r4), 1, 5 /* qr5 */ -/* 8030C980 EC 00 39 7A */ fmadds f0, f0, f5, f7 -/* 8030C984 EC 43 00 F2 */ fmuls f2, f3, f3 -/* 8030C988 EC 85 20 7C */ fnmsubs f4, f5, f1, f4 -/* 8030C98C EC 00 30 28 */ fsubs f0, f0, f6 -/* 8030C990 EC 00 20 28 */ fsubs f0, f0, f4 -/* 8030C994 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8030C998 EC 25 00 7A */ fmadds f1, f5, f1, f0 -/* 8030C99C EC 21 38 FA */ fmadds f1, f1, f3, f7 -/* 8030C9A0 EC 24 08 BA */ fmadds f1, f4, f2, f1 -/* 8030C9A4 EC 21 00 28 */ fsubs f1, f1, f0 -lbl_8030C9A8: -/* 8030C9A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C9AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/func_8030C9B0.s b/asm/JSystem/J2DGraph/J2DAnimation/func_8030C9B0.s deleted file mode 100644 index bb3c09c8136..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/func_8030C9B0.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_8030C9B0: -/* 8030C9B0 C0 04 00 00 */ lfs f0, 0(r4) -/* 8030C9B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8030C9B8 40 80 00 0C */ bge lbl_8030C9C4 -/* 8030C9BC C0 24 00 04 */ lfs f1, 4(r4) -/* 8030C9C0 4E 80 00 20 */ blr -lbl_8030C9C4: -/* 8030C9C4 A0 03 00 04 */ lhz r0, 4(r3) -/* 8030C9C8 28 00 00 00 */ cmplwi r0, 0 -/* 8030C9CC 40 82 00 B4 */ bne lbl_8030CA80 -/* 8030C9D0 A0 63 00 00 */ lhz r3, 0(r3) -/* 8030C9D4 38 03 FF FF */ addi r0, r3, -1 -/* 8030C9D8 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8030C9DC 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8030C9E0 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8030C9E4 4C 40 13 82 */ cror 2, 0, 2 -/* 8030C9E8 40 82 00 40 */ bne lbl_8030CA28 -/* 8030C9EC 7C 64 02 14 */ add r3, r4, r0 -/* 8030C9F0 C0 23 00 04 */ lfs f1, 4(r3) -/* 8030C9F4 4E 80 00 20 */ blr -/* 8030C9F8 48 00 00 30 */ b lbl_8030CA28 -lbl_8030C9FC: -/* 8030C9FC 54 65 F8 7E */ srwi r5, r3, 1 -/* 8030CA00 1C 05 00 03 */ mulli r0, r5, 3 -/* 8030CA04 54 00 10 3A */ slwi r0, r0, 2 -/* 8030CA08 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8030CA0C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8030CA10 4C 41 13 82 */ cror 2, 1, 2 -/* 8030CA14 40 82 00 10 */ bne lbl_8030CA24 -/* 8030CA18 7C 84 02 14 */ add r4, r4, r0 -/* 8030CA1C 7C 65 18 50 */ subf r3, r5, r3 -/* 8030CA20 48 00 00 08 */ b lbl_8030CA28 -lbl_8030CA24: -/* 8030CA24 7C A3 2B 78 */ mr r3, r5 -lbl_8030CA28: -/* 8030CA28 28 03 00 01 */ cmplwi r3, 1 -/* 8030CA2C 41 81 FF D0 */ bgt lbl_8030C9FC -/* 8030CA30 C1 24 00 14 */ lfs f9, 0x14(r4) -/* 8030CA34 C1 04 00 10 */ lfs f8, 0x10(r4) -/* 8030CA38 C0 44 00 0C */ lfs f2, 0xc(r4) -/* 8030CA3C C0 E4 00 08 */ lfs f7, 8(r4) -/* 8030CA40 C0 C4 00 04 */ lfs f6, 4(r4) -/* 8030CA44 C0 04 00 00 */ lfs f0, 0(r4) -/* 8030CA48 EC A1 00 28 */ fsubs f5, f1, f0 -/* 8030CA4C EC 82 00 28 */ fsubs f4, f2, f0 -/* 8030CA50 EC 65 20 24 */ fdivs f3, f5, f4 -/* 8030CA54 EC 03 00 F2 */ fmuls f0, f3, f3 -/* 8030CA58 EC 23 18 2A */ fadds f1, f3, f3 -/* 8030CA5C EC 40 18 28 */ fsubs f2, f0, f3 -/* 8030CA60 EC 86 40 28 */ fsubs f4, f6, f8 -/* 8030CA64 EC 01 00 B8 */ fmsubs f0, f1, f2, f0 -/* 8030CA68 EC 27 38 BA */ fmadds f1, f7, f2, f7 -/* 8030CA6C EC 00 31 3A */ fmadds f0, f0, f4, f6 -/* 8030CA70 EC 29 08 BA */ fmadds f1, f9, f2, f1 -/* 8030CA74 EC 23 09 F8 */ fmsubs f1, f3, f7, f1 -/* 8030CA78 EC 25 00 7C */ fnmsubs f1, f5, f1, f0 -/* 8030CA7C 4E 80 00 20 */ blr -lbl_8030CA80: -/* 8030CA80 A0 63 00 00 */ lhz r3, 0(r3) -/* 8030CA84 38 03 FF FF */ addi r0, r3, -1 -/* 8030CA88 54 00 20 36 */ slwi r0, r0, 4 -/* 8030CA8C 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8030CA90 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8030CA94 4C 40 13 82 */ cror 2, 0, 2 -/* 8030CA98 40 82 00 3C */ bne lbl_8030CAD4 -/* 8030CA9C 7C 64 02 14 */ add r3, r4, r0 -/* 8030CAA0 C0 23 00 04 */ lfs f1, 4(r3) -/* 8030CAA4 4E 80 00 20 */ blr -/* 8030CAA8 48 00 00 2C */ b lbl_8030CAD4 -lbl_8030CAAC: -/* 8030CAAC 54 65 F8 7E */ srwi r5, r3, 1 -/* 8030CAB0 54 60 18 36 */ rlwinm r0, r3, 3, 0, 0x1b -/* 8030CAB4 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8030CAB8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8030CABC 4C 41 13 82 */ cror 2, 1, 2 -/* 8030CAC0 40 82 00 10 */ bne lbl_8030CAD0 -/* 8030CAC4 7C 84 02 14 */ add r4, r4, r0 -/* 8030CAC8 7C 65 18 50 */ subf r3, r5, r3 -/* 8030CACC 48 00 00 08 */ b lbl_8030CAD4 -lbl_8030CAD0: -/* 8030CAD0 7C A3 2B 78 */ mr r3, r5 -lbl_8030CAD4: -/* 8030CAD4 28 03 00 01 */ cmplwi r3, 1 -/* 8030CAD8 41 81 FF D4 */ bgt lbl_8030CAAC -/* 8030CADC C1 24 00 18 */ lfs f9, 0x18(r4) -/* 8030CAE0 C1 04 00 14 */ lfs f8, 0x14(r4) -/* 8030CAE4 C0 44 00 10 */ lfs f2, 0x10(r4) -/* 8030CAE8 C0 E4 00 0C */ lfs f7, 0xc(r4) -/* 8030CAEC C0 C4 00 04 */ lfs f6, 4(r4) -/* 8030CAF0 C0 04 00 00 */ lfs f0, 0(r4) -/* 8030CAF4 EC A1 00 28 */ fsubs f5, f1, f0 -/* 8030CAF8 EC 82 00 28 */ fsubs f4, f2, f0 -/* 8030CAFC EC 65 20 24 */ fdivs f3, f5, f4 -/* 8030CB00 EC 03 00 F2 */ fmuls f0, f3, f3 -/* 8030CB04 EC 23 18 2A */ fadds f1, f3, f3 -/* 8030CB08 EC 40 18 28 */ fsubs f2, f0, f3 -/* 8030CB0C EC 86 40 28 */ fsubs f4, f6, f8 -/* 8030CB10 EC 01 00 B8 */ fmsubs f0, f1, f2, f0 -/* 8030CB14 EC 27 38 BA */ fmadds f1, f7, f2, f7 -/* 8030CB18 EC 00 31 3A */ fmadds f0, f0, f4, f6 -/* 8030CB1C EC 29 08 BA */ fmadds f1, f9, f2, f1 -/* 8030CB20 EC 23 09 F8 */ fmsubs f1, f3, f7, f1 -/* 8030CB24 EC 25 00 7C */ fnmsubs f1, f5, f1, f0 -/* 8030CB28 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getColor__14J2DAnmColorKeyCFUsP8_GXColor.s b/asm/JSystem/J2DGraph/J2DAnimation/getColor__14J2DAnmColorKeyCFUsP8_GXColor.s deleted file mode 100644 index d09ed003c67..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getColor__14J2DAnmColorKeyCFUsP8_GXColor.s +++ /dev/null @@ -1,202 +0,0 @@ -lbl_8030B200: -/* 8030B200 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8030B204 7C 08 02 A6 */ mflr r0 -/* 8030B208 90 01 00 44 */ stw r0, 0x44(r1) -/* 8030B20C DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8030B210 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8030B214 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B218 48 05 6F C5 */ bl _savegpr_29 -/* 8030B21C 7C 7D 1B 78 */ mr r29, r3 -/* 8030B220 7C BE 2B 78 */ mr r30, r5 -/* 8030B224 80 63 00 40 */ lwz r3, 0x40(r3) -/* 8030B228 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 8030B22C 1C 00 00 18 */ mulli r0, r0, 0x18 -/* 8030B230 7F E3 02 14 */ add r31, r3, r0 -/* 8030B234 A0 1F 00 00 */ lhz r0, 0(r31) -/* 8030B238 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B23C 41 82 00 20 */ beq lbl_8030B25C -/* 8030B240 40 80 00 34 */ bge lbl_8030B274 -/* 8030B244 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B248 40 80 00 08 */ bge lbl_8030B250 -/* 8030B24C 48 00 00 28 */ b lbl_8030B274 -lbl_8030B250: -/* 8030B250 38 00 00 00 */ li r0, 0 -/* 8030B254 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B258 48 00 00 78 */ b lbl_8030B2D0 -lbl_8030B25C: -/* 8030B25C 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 8030B260 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030B264 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B268 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B26C 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B270 48 00 00 60 */ b lbl_8030B2D0 -lbl_8030B274: -/* 8030B274 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B278 7F E3 FB 78 */ mr r3, r31 -/* 8030B27C 80 9D 00 30 */ lwz r4, 0x30(r29) -/* 8030B280 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030B284 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B288 7C 84 02 14 */ add r4, r4, r0 -/* 8030B28C 48 00 14 F1 */ bl func_8030C77C -/* 8030B290 FF E0 08 90 */ fmr f31, f1 -/* 8030B294 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B298 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B29C 40 80 00 10 */ bge lbl_8030B2AC -/* 8030B2A0 38 00 00 00 */ li r0, 0 -/* 8030B2A4 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B2A8 48 00 00 28 */ b lbl_8030B2D0 -lbl_8030B2AC: -/* 8030B2AC C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B2B0 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B2B4 40 81 00 10 */ ble lbl_8030B2C4 -/* 8030B2B8 38 00 00 FF */ li r0, 0xff -/* 8030B2BC 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B2C0 48 00 00 10 */ b lbl_8030B2D0 -lbl_8030B2C4: -/* 8030B2C4 F3 E1 A0 14 */ psq_st f31, 20(r1), 1, 2 /* qr2 */ -/* 8030B2C8 88 01 00 14 */ lbz r0, 0x14(r1) -/* 8030B2CC 98 1E 00 00 */ stb r0, 0(r30) -lbl_8030B2D0: -/* 8030B2D0 A0 1F 00 06 */ lhz r0, 6(r31) -/* 8030B2D4 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B2D8 41 82 00 20 */ beq lbl_8030B2F8 -/* 8030B2DC 40 80 00 34 */ bge lbl_8030B310 -/* 8030B2E0 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B2E4 40 80 00 08 */ bge lbl_8030B2EC -/* 8030B2E8 48 00 00 28 */ b lbl_8030B310 -lbl_8030B2EC: -/* 8030B2EC 38 00 00 00 */ li r0, 0 -/* 8030B2F0 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B2F4 48 00 00 78 */ b lbl_8030B36C -lbl_8030B2F8: -/* 8030B2F8 80 7D 00 34 */ lwz r3, 0x34(r29) -/* 8030B2FC A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030B300 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B304 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B308 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B30C 48 00 00 60 */ b lbl_8030B36C -lbl_8030B310: -/* 8030B310 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B314 38 7F 00 06 */ addi r3, r31, 6 -/* 8030B318 80 9D 00 34 */ lwz r4, 0x34(r29) -/* 8030B31C A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030B320 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B324 7C 84 02 14 */ add r4, r4, r0 -/* 8030B328 48 00 14 55 */ bl func_8030C77C -/* 8030B32C FF E0 08 90 */ fmr f31, f1 -/* 8030B330 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B334 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B338 40 80 00 10 */ bge lbl_8030B348 -/* 8030B33C 38 00 00 00 */ li r0, 0 -/* 8030B340 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B344 48 00 00 28 */ b lbl_8030B36C -lbl_8030B348: -/* 8030B348 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B34C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B350 40 81 00 10 */ ble lbl_8030B360 -/* 8030B354 38 00 00 FF */ li r0, 0xff -/* 8030B358 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B35C 48 00 00 10 */ b lbl_8030B36C -lbl_8030B360: -/* 8030B360 F3 E1 A0 10 */ psq_st f31, 16(r1), 1, 2 /* qr2 */ -/* 8030B364 88 01 00 10 */ lbz r0, 0x10(r1) -/* 8030B368 98 1E 00 01 */ stb r0, 1(r30) -lbl_8030B36C: -/* 8030B36C A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8030B370 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B374 41 82 00 20 */ beq lbl_8030B394 -/* 8030B378 40 80 00 34 */ bge lbl_8030B3AC -/* 8030B37C 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B380 40 80 00 08 */ bge lbl_8030B388 -/* 8030B384 48 00 00 28 */ b lbl_8030B3AC -lbl_8030B388: -/* 8030B388 38 00 00 00 */ li r0, 0 -/* 8030B38C 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B390 48 00 00 78 */ b lbl_8030B408 -lbl_8030B394: -/* 8030B394 80 7D 00 38 */ lwz r3, 0x38(r29) -/* 8030B398 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030B39C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B3A0 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B3A4 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B3A8 48 00 00 60 */ b lbl_8030B408 -lbl_8030B3AC: -/* 8030B3AC C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B3B0 38 7F 00 0C */ addi r3, r31, 0xc -/* 8030B3B4 80 9D 00 38 */ lwz r4, 0x38(r29) -/* 8030B3B8 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030B3BC 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B3C0 7C 84 02 14 */ add r4, r4, r0 -/* 8030B3C4 48 00 13 B9 */ bl func_8030C77C -/* 8030B3C8 FF E0 08 90 */ fmr f31, f1 -/* 8030B3CC C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B3D0 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B3D4 40 80 00 10 */ bge lbl_8030B3E4 -/* 8030B3D8 38 00 00 00 */ li r0, 0 -/* 8030B3DC 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B3E0 48 00 00 28 */ b lbl_8030B408 -lbl_8030B3E4: -/* 8030B3E4 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B3E8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B3EC 40 81 00 10 */ ble lbl_8030B3FC -/* 8030B3F0 38 00 00 FF */ li r0, 0xff -/* 8030B3F4 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B3F8 48 00 00 10 */ b lbl_8030B408 -lbl_8030B3FC: -/* 8030B3FC F3 E1 A0 0C */ psq_st f31, 12(r1), 1, 2 /* qr2 */ -/* 8030B400 88 01 00 0C */ lbz r0, 0xc(r1) -/* 8030B404 98 1E 00 02 */ stb r0, 2(r30) -lbl_8030B408: -/* 8030B408 A0 1F 00 12 */ lhz r0, 0x12(r31) -/* 8030B40C 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B410 41 82 00 20 */ beq lbl_8030B430 -/* 8030B414 40 80 00 34 */ bge lbl_8030B448 -/* 8030B418 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B41C 40 80 00 08 */ bge lbl_8030B424 -/* 8030B420 48 00 00 28 */ b lbl_8030B448 -lbl_8030B424: -/* 8030B424 38 00 00 00 */ li r0, 0 -/* 8030B428 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B42C 48 00 00 78 */ b lbl_8030B4A4 -lbl_8030B430: -/* 8030B430 80 7D 00 3C */ lwz r3, 0x3c(r29) -/* 8030B434 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030B438 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B43C 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B440 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B444 48 00 00 60 */ b lbl_8030B4A4 -lbl_8030B448: -/* 8030B448 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B44C 38 7F 00 12 */ addi r3, r31, 0x12 -/* 8030B450 80 9D 00 3C */ lwz r4, 0x3c(r29) -/* 8030B454 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030B458 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B45C 7C 84 02 14 */ add r4, r4, r0 -/* 8030B460 48 00 13 1D */ bl func_8030C77C -/* 8030B464 FF E0 08 90 */ fmr f31, f1 -/* 8030B468 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B46C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B470 40 80 00 10 */ bge lbl_8030B480 -/* 8030B474 38 00 00 00 */ li r0, 0 -/* 8030B478 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B47C 48 00 00 28 */ b lbl_8030B4A4 -lbl_8030B480: -/* 8030B480 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B484 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B488 40 81 00 10 */ ble lbl_8030B498 -/* 8030B48C 38 00 00 FF */ li r0, 0xff -/* 8030B490 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B494 48 00 00 10 */ b lbl_8030B4A4 -lbl_8030B498: -/* 8030B498 F3 E1 A0 08 */ psq_st f31, 8(r1), 1, 2 /* qr2 */ -/* 8030B49C 88 01 00 08 */ lbz r0, 8(r1) -/* 8030B4A0 98 1E 00 03 */ stb r0, 3(r30) -lbl_8030B4A4: -/* 8030B4A4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8030B4A8 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8030B4AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B4B0 48 05 6D 79 */ bl _restgpr_29 -/* 8030B4B4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030B4B8 7C 08 03 A6 */ mtlr r0 -/* 8030B4BC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030B4C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getColor__15J2DAnmColorFullCFUsP8_GXColor.s b/asm/JSystem/J2DGraph/J2DAnimation/getColor__15J2DAnmColorFullCFUsP8_GXColor.s deleted file mode 100644 index 78fe3481dc4..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getColor__15J2DAnmColorFullCFUsP8_GXColor.s +++ /dev/null @@ -1,155 +0,0 @@ -lbl_8030AFC8: -/* 8030AFC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030AFCC 80 C3 00 40 */ lwz r6, 0x40(r3) -/* 8030AFD0 54 80 23 36 */ rlwinm r0, r4, 4, 0xc, 0x1b -/* 8030AFD4 7C 86 02 14 */ add r4, r6, r0 -/* 8030AFD8 A0 E4 00 00 */ lhz r7, 0(r4) -/* 8030AFDC C0 43 00 08 */ lfs f2, 8(r3) -/* 8030AFE0 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030AFE4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030AFE8 40 80 00 18 */ bge lbl_8030B000 -/* 8030AFEC 80 C3 00 30 */ lwz r6, 0x30(r3) -/* 8030AFF0 A0 04 00 02 */ lhz r0, 2(r4) -/* 8030AFF4 7C 06 00 AE */ lbzx r0, r6, r0 -/* 8030AFF8 98 05 00 00 */ stb r0, 0(r5) -/* 8030AFFC 48 00 00 64 */ b lbl_8030B060 -lbl_8030B000: -/* 8030B000 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B004 90 E1 00 0C */ stw r7, 0xc(r1) -/* 8030B008 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B00C 90 01 00 08 */ stw r0, 8(r1) -/* 8030B010 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B014 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B018 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B01C 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B020 40 82 00 20 */ bne lbl_8030B040 -/* 8030B024 80 C3 00 30 */ lwz r6, 0x30(r3) -/* 8030B028 A0 04 00 02 */ lhz r0, 2(r4) -/* 8030B02C 7C 06 02 14 */ add r0, r6, r0 -/* 8030B030 7C C0 3A 14 */ add r6, r0, r7 -/* 8030B034 88 06 FF FF */ lbz r0, -1(r6) -/* 8030B038 98 05 00 00 */ stb r0, 0(r5) -/* 8030B03C 48 00 00 24 */ b lbl_8030B060 -lbl_8030B040: -/* 8030B040 80 E3 00 30 */ lwz r7, 0x30(r3) -/* 8030B044 A0 C4 00 02 */ lhz r6, 2(r4) -/* 8030B048 FC 00 10 1E */ fctiwz f0, f2 -/* 8030B04C D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B050 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B054 7C 06 02 14 */ add r0, r6, r0 -/* 8030B058 7C 07 00 AE */ lbzx r0, r7, r0 -/* 8030B05C 98 05 00 00 */ stb r0, 0(r5) -lbl_8030B060: -/* 8030B060 A0 E4 00 04 */ lhz r7, 4(r4) -/* 8030B064 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030B068 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B06C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B070 40 80 00 18 */ bge lbl_8030B088 -/* 8030B074 80 C3 00 34 */ lwz r6, 0x34(r3) -/* 8030B078 A0 04 00 06 */ lhz r0, 6(r4) -/* 8030B07C 7C 06 00 AE */ lbzx r0, r6, r0 -/* 8030B080 98 05 00 01 */ stb r0, 1(r5) -/* 8030B084 48 00 00 64 */ b lbl_8030B0E8 -lbl_8030B088: -/* 8030B088 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B08C 90 E1 00 0C */ stw r7, 0xc(r1) -/* 8030B090 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B094 90 01 00 08 */ stw r0, 8(r1) -/* 8030B098 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B09C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B0A0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B0A4 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B0A8 40 82 00 20 */ bne lbl_8030B0C8 -/* 8030B0AC 80 C3 00 34 */ lwz r6, 0x34(r3) -/* 8030B0B0 A0 04 00 06 */ lhz r0, 6(r4) -/* 8030B0B4 7C 06 02 14 */ add r0, r6, r0 -/* 8030B0B8 7C C0 3A 14 */ add r6, r0, r7 -/* 8030B0BC 88 06 FF FF */ lbz r0, -1(r6) -/* 8030B0C0 98 05 00 01 */ stb r0, 1(r5) -/* 8030B0C4 48 00 00 24 */ b lbl_8030B0E8 -lbl_8030B0C8: -/* 8030B0C8 80 E3 00 34 */ lwz r7, 0x34(r3) -/* 8030B0CC A0 C4 00 06 */ lhz r6, 6(r4) -/* 8030B0D0 FC 00 10 1E */ fctiwz f0, f2 -/* 8030B0D4 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B0D8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B0DC 7C 06 02 14 */ add r0, r6, r0 -/* 8030B0E0 7C 07 00 AE */ lbzx r0, r7, r0 -/* 8030B0E4 98 05 00 01 */ stb r0, 1(r5) -lbl_8030B0E8: -/* 8030B0E8 A0 E4 00 08 */ lhz r7, 8(r4) -/* 8030B0EC C0 43 00 08 */ lfs f2, 8(r3) -/* 8030B0F0 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B0F4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B0F8 40 80 00 18 */ bge lbl_8030B110 -/* 8030B0FC 80 C3 00 38 */ lwz r6, 0x38(r3) -/* 8030B100 A0 04 00 0A */ lhz r0, 0xa(r4) -/* 8030B104 7C 06 00 AE */ lbzx r0, r6, r0 -/* 8030B108 98 05 00 02 */ stb r0, 2(r5) -/* 8030B10C 48 00 00 64 */ b lbl_8030B170 -lbl_8030B110: -/* 8030B110 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B114 90 E1 00 0C */ stw r7, 0xc(r1) -/* 8030B118 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B11C 90 01 00 08 */ stw r0, 8(r1) -/* 8030B120 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B124 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B128 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B12C 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B130 40 82 00 20 */ bne lbl_8030B150 -/* 8030B134 80 C3 00 38 */ lwz r6, 0x38(r3) -/* 8030B138 A0 04 00 0A */ lhz r0, 0xa(r4) -/* 8030B13C 7C 06 02 14 */ add r0, r6, r0 -/* 8030B140 7C C0 3A 14 */ add r6, r0, r7 -/* 8030B144 88 06 FF FF */ lbz r0, -1(r6) -/* 8030B148 98 05 00 02 */ stb r0, 2(r5) -/* 8030B14C 48 00 00 24 */ b lbl_8030B170 -lbl_8030B150: -/* 8030B150 80 E3 00 38 */ lwz r7, 0x38(r3) -/* 8030B154 A0 C4 00 0A */ lhz r6, 0xa(r4) -/* 8030B158 FC 00 10 1E */ fctiwz f0, f2 -/* 8030B15C D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B160 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B164 7C 06 02 14 */ add r0, r6, r0 -/* 8030B168 7C 07 00 AE */ lbzx r0, r7, r0 -/* 8030B16C 98 05 00 02 */ stb r0, 2(r5) -lbl_8030B170: -/* 8030B170 A0 C4 00 0C */ lhz r6, 0xc(r4) -/* 8030B174 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030B178 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B17C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B180 40 80 00 18 */ bge lbl_8030B198 -/* 8030B184 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 8030B188 A0 04 00 0E */ lhz r0, 0xe(r4) -/* 8030B18C 7C 03 00 AE */ lbzx r0, r3, r0 -/* 8030B190 98 05 00 03 */ stb r0, 3(r5) -/* 8030B194 48 00 00 64 */ b lbl_8030B1F8 -lbl_8030B198: -/* 8030B198 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B19C 90 C1 00 0C */ stw r6, 0xc(r1) -/* 8030B1A0 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B1A4 90 01 00 08 */ stw r0, 8(r1) -/* 8030B1A8 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B1AC EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B1B0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B1B4 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B1B8 40 82 00 20 */ bne lbl_8030B1D8 -/* 8030B1BC 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 8030B1C0 A0 04 00 0E */ lhz r0, 0xe(r4) -/* 8030B1C4 7C 03 02 14 */ add r0, r3, r0 -/* 8030B1C8 7C 60 32 14 */ add r3, r0, r6 -/* 8030B1CC 88 03 FF FF */ lbz r0, -1(r3) -/* 8030B1D0 98 05 00 03 */ stb r0, 3(r5) -/* 8030B1D4 48 00 00 24 */ b lbl_8030B1F8 -lbl_8030B1D8: -/* 8030B1D8 80 C3 00 3C */ lwz r6, 0x3c(r3) -/* 8030B1DC A0 64 00 0E */ lhz r3, 0xe(r4) -/* 8030B1E0 FC 00 10 1E */ fctiwz f0, f2 -/* 8030B1E4 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B1E8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B1EC 7C 03 02 14 */ add r0, r3, r0 -/* 8030B1F0 7C 06 00 AE */ lbzx r0, r6, r0 -/* 8030B1F4 98 05 00 03 */ stb r0, 3(r5) -lbl_8030B1F8: -/* 8030B1F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B1FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor.s b/asm/JSystem/J2DGraph/J2DAnimation/getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor.s deleted file mode 100644 index 5ed944c6190..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor.s +++ /dev/null @@ -1,212 +0,0 @@ -lbl_8030B704: -/* 8030B704 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8030B708 7C 08 02 A6 */ mflr r0 -/* 8030B70C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8030B710 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8030B714 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8030B718 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B71C 48 05 6A C1 */ bl _savegpr_29 -/* 8030B720 7C 7D 1B 78 */ mr r29, r3 -/* 8030B724 7C DE 33 78 */ mr r30, r6 -/* 8030B728 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 8030B72C 7C 7D 02 14 */ add r3, r29, r0 -/* 8030B730 80 63 00 24 */ lwz r3, 0x24(r3) -/* 8030B734 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 8030B738 1C 00 00 18 */ mulli r0, r0, 0x18 -/* 8030B73C 7F E3 02 14 */ add r31, r3, r0 -/* 8030B740 A0 1F 00 00 */ lhz r0, 0(r31) -/* 8030B744 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B748 41 82 00 20 */ beq lbl_8030B768 -/* 8030B74C 40 80 00 34 */ bge lbl_8030B780 -/* 8030B750 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B754 40 80 00 08 */ bge lbl_8030B75C -/* 8030B758 48 00 00 28 */ b lbl_8030B780 -lbl_8030B75C: -/* 8030B75C 38 00 00 00 */ li r0, 0 -/* 8030B760 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B764 48 00 00 80 */ b lbl_8030B7E4 -lbl_8030B768: -/* 8030B768 80 7D 00 2C */ lwz r3, 0x2c(r29) -/* 8030B76C A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030B770 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B774 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B778 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B77C 48 00 00 68 */ b lbl_8030B7E4 -lbl_8030B780: -/* 8030B780 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B784 7F E3 FB 78 */ mr r3, r31 -/* 8030B788 80 9D 00 2C */ lwz r4, 0x2c(r29) -/* 8030B78C A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030B790 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B794 7C 84 02 14 */ add r4, r4, r0 -/* 8030B798 48 00 0F E5 */ bl func_8030C77C -/* 8030B79C FF E0 08 90 */ fmr f31, f1 -/* 8030B7A0 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B7A4 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B7A8 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B7AC 40 82 00 10 */ bne lbl_8030B7BC -/* 8030B7B0 38 00 00 00 */ li r0, 0 -/* 8030B7B4 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B7B8 48 00 00 2C */ b lbl_8030B7E4 -lbl_8030B7BC: -/* 8030B7BC C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B7C0 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B7C4 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B7C8 40 82 00 14 */ bne lbl_8030B7DC -/* 8030B7CC F3 E1 A0 14 */ psq_st f31, 20(r1), 1, 2 /* qr2 */ -/* 8030B7D0 88 01 00 14 */ lbz r0, 0x14(r1) -/* 8030B7D4 98 1E 00 00 */ stb r0, 0(r30) -/* 8030B7D8 48 00 00 0C */ b lbl_8030B7E4 -lbl_8030B7DC: -/* 8030B7DC 38 00 00 FF */ li r0, 0xff -/* 8030B7E0 98 1E 00 00 */ stb r0, 0(r30) -lbl_8030B7E4: -/* 8030B7E4 A0 1F 00 06 */ lhz r0, 6(r31) -/* 8030B7E8 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B7EC 41 82 00 20 */ beq lbl_8030B80C -/* 8030B7F0 40 80 00 34 */ bge lbl_8030B824 -/* 8030B7F4 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B7F8 40 80 00 08 */ bge lbl_8030B800 -/* 8030B7FC 48 00 00 28 */ b lbl_8030B824 -lbl_8030B800: -/* 8030B800 38 00 00 00 */ li r0, 0 -/* 8030B804 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B808 48 00 00 80 */ b lbl_8030B888 -lbl_8030B80C: -/* 8030B80C 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 8030B810 A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030B814 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B818 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B81C 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B820 48 00 00 68 */ b lbl_8030B888 -lbl_8030B824: -/* 8030B824 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B828 38 7F 00 06 */ addi r3, r31, 6 -/* 8030B82C 80 9D 00 30 */ lwz r4, 0x30(r29) -/* 8030B830 A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030B834 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B838 7C 84 02 14 */ add r4, r4, r0 -/* 8030B83C 48 00 0F 41 */ bl func_8030C77C -/* 8030B840 FF E0 08 90 */ fmr f31, f1 -/* 8030B844 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B848 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B84C 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B850 40 82 00 10 */ bne lbl_8030B860 -/* 8030B854 38 00 00 00 */ li r0, 0 -/* 8030B858 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B85C 48 00 00 2C */ b lbl_8030B888 -lbl_8030B860: -/* 8030B860 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B864 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B868 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B86C 40 82 00 14 */ bne lbl_8030B880 -/* 8030B870 F3 E1 A0 10 */ psq_st f31, 16(r1), 1, 2 /* qr2 */ -/* 8030B874 88 01 00 10 */ lbz r0, 0x10(r1) -/* 8030B878 98 1E 00 01 */ stb r0, 1(r30) -/* 8030B87C 48 00 00 0C */ b lbl_8030B888 -lbl_8030B880: -/* 8030B880 38 00 00 FF */ li r0, 0xff -/* 8030B884 98 1E 00 01 */ stb r0, 1(r30) -lbl_8030B888: -/* 8030B888 A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8030B88C 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B890 41 82 00 20 */ beq lbl_8030B8B0 -/* 8030B894 40 80 00 34 */ bge lbl_8030B8C8 -/* 8030B898 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B89C 40 80 00 08 */ bge lbl_8030B8A4 -/* 8030B8A0 48 00 00 28 */ b lbl_8030B8C8 -lbl_8030B8A4: -/* 8030B8A4 38 00 00 00 */ li r0, 0 -/* 8030B8A8 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B8AC 48 00 00 80 */ b lbl_8030B92C -lbl_8030B8B0: -/* 8030B8B0 80 7D 00 34 */ lwz r3, 0x34(r29) -/* 8030B8B4 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030B8B8 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B8BC 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B8C0 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B8C4 48 00 00 68 */ b lbl_8030B92C -lbl_8030B8C8: -/* 8030B8C8 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B8CC 38 7F 00 0C */ addi r3, r31, 0xc -/* 8030B8D0 80 9D 00 34 */ lwz r4, 0x34(r29) -/* 8030B8D4 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030B8D8 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B8DC 7C 84 02 14 */ add r4, r4, r0 -/* 8030B8E0 48 00 0E 9D */ bl func_8030C77C -/* 8030B8E4 FF E0 08 90 */ fmr f31, f1 -/* 8030B8E8 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B8EC FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B8F0 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B8F4 40 82 00 10 */ bne lbl_8030B904 -/* 8030B8F8 38 00 00 00 */ li r0, 0 -/* 8030B8FC 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B900 48 00 00 2C */ b lbl_8030B92C -lbl_8030B904: -/* 8030B904 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B908 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B90C 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B910 40 82 00 14 */ bne lbl_8030B924 -/* 8030B914 F3 E1 A0 0C */ psq_st f31, 12(r1), 1, 2 /* qr2 */ -/* 8030B918 88 01 00 0C */ lbz r0, 0xc(r1) -/* 8030B91C 98 1E 00 02 */ stb r0, 2(r30) -/* 8030B920 48 00 00 0C */ b lbl_8030B92C -lbl_8030B924: -/* 8030B924 38 00 00 FF */ li r0, 0xff -/* 8030B928 98 1E 00 02 */ stb r0, 2(r30) -lbl_8030B92C: -/* 8030B92C A0 1F 00 12 */ lhz r0, 0x12(r31) -/* 8030B930 2C 00 00 01 */ cmpwi r0, 1 -/* 8030B934 41 82 00 20 */ beq lbl_8030B954 -/* 8030B938 40 80 00 34 */ bge lbl_8030B96C -/* 8030B93C 2C 00 00 00 */ cmpwi r0, 0 -/* 8030B940 40 80 00 08 */ bge lbl_8030B948 -/* 8030B944 48 00 00 28 */ b lbl_8030B96C -lbl_8030B948: -/* 8030B948 38 00 00 00 */ li r0, 0 -/* 8030B94C 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B950 48 00 00 80 */ b lbl_8030B9D0 -lbl_8030B954: -/* 8030B954 80 7D 00 38 */ lwz r3, 0x38(r29) -/* 8030B958 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030B95C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B960 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030B964 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B968 48 00 00 68 */ b lbl_8030B9D0 -lbl_8030B96C: -/* 8030B96C C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030B970 38 7F 00 12 */ addi r3, r31, 0x12 -/* 8030B974 80 9D 00 38 */ lwz r4, 0x38(r29) -/* 8030B978 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030B97C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030B980 7C 84 02 14 */ add r4, r4, r0 -/* 8030B984 48 00 0D F9 */ bl func_8030C77C -/* 8030B988 FF E0 08 90 */ fmr f31, f1 -/* 8030B98C C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B990 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B994 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B998 40 82 00 10 */ bne lbl_8030B9A8 -/* 8030B99C 38 00 00 00 */ li r0, 0 -/* 8030B9A0 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B9A4 48 00 00 2C */ b lbl_8030B9D0 -lbl_8030B9A8: -/* 8030B9A8 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030B9AC FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030B9B0 4C 40 13 82 */ cror 2, 0, 2 -/* 8030B9B4 40 82 00 14 */ bne lbl_8030B9C8 -/* 8030B9B8 F3 E1 A0 08 */ psq_st f31, 8(r1), 1, 2 /* qr2 */ -/* 8030B9BC 88 01 00 08 */ lbz r0, 8(r1) -/* 8030B9C0 98 1E 00 03 */ stb r0, 3(r30) -/* 8030B9C4 48 00 00 0C */ b lbl_8030B9D0 -lbl_8030B9C8: -/* 8030B9C8 38 00 00 FF */ li r0, 0xff -/* 8030B9CC 98 1E 00 03 */ stb r0, 3(r30) -lbl_8030B9D0: -/* 8030B9D0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8030B9D4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8030B9D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B9DC 48 05 68 4D */ bl _restgpr_29 -/* 8030B9E0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030B9E4 7C 08 03 A6 */ mtlr r0 -/* 8030B9E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030B9EC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor.s b/asm/JSystem/J2DGraph/J2DAnimation/getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor.s deleted file mode 100644 index 8503ee813fb..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor.s +++ /dev/null @@ -1,157 +0,0 @@ -lbl_8030B4C4: -/* 8030B4C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030B4C8 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 8030B4CC 7C 83 02 14 */ add r4, r3, r0 -/* 8030B4D0 80 84 00 24 */ lwz r4, 0x24(r4) -/* 8030B4D4 54 A0 23 36 */ rlwinm r0, r5, 4, 0xc, 0x1b -/* 8030B4D8 7C 84 02 14 */ add r4, r4, r0 -/* 8030B4DC A0 E4 00 00 */ lhz r7, 0(r4) -/* 8030B4E0 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030B4E4 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B4E8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B4EC 40 80 00 18 */ bge lbl_8030B504 -/* 8030B4F0 80 A3 00 2C */ lwz r5, 0x2c(r3) -/* 8030B4F4 A0 04 00 02 */ lhz r0, 2(r4) -/* 8030B4F8 7C 05 00 AE */ lbzx r0, r5, r0 -/* 8030B4FC 98 06 00 00 */ stb r0, 0(r6) -/* 8030B500 48 00 00 64 */ b lbl_8030B564 -lbl_8030B504: -/* 8030B504 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B508 90 E1 00 0C */ stw r7, 0xc(r1) -/* 8030B50C 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B510 90 01 00 08 */ stw r0, 8(r1) -/* 8030B514 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B518 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B51C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B520 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B524 40 82 00 20 */ bne lbl_8030B544 -/* 8030B528 80 A3 00 2C */ lwz r5, 0x2c(r3) -/* 8030B52C A0 04 00 02 */ lhz r0, 2(r4) -/* 8030B530 7C 05 02 14 */ add r0, r5, r0 -/* 8030B534 7C A0 3A 14 */ add r5, r0, r7 -/* 8030B538 88 05 FF FF */ lbz r0, -1(r5) -/* 8030B53C 98 06 00 00 */ stb r0, 0(r6) -/* 8030B540 48 00 00 24 */ b lbl_8030B564 -lbl_8030B544: -/* 8030B544 80 E3 00 2C */ lwz r7, 0x2c(r3) -/* 8030B548 A0 A4 00 02 */ lhz r5, 2(r4) -/* 8030B54C FC 00 10 1E */ fctiwz f0, f2 -/* 8030B550 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B554 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B558 7C 05 02 14 */ add r0, r5, r0 -/* 8030B55C 7C 07 00 AE */ lbzx r0, r7, r0 -/* 8030B560 98 06 00 00 */ stb r0, 0(r6) -lbl_8030B564: -/* 8030B564 A0 E4 00 04 */ lhz r7, 4(r4) -/* 8030B568 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030B56C C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B570 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B574 40 80 00 18 */ bge lbl_8030B58C -/* 8030B578 80 A3 00 30 */ lwz r5, 0x30(r3) -/* 8030B57C A0 04 00 06 */ lhz r0, 6(r4) -/* 8030B580 7C 05 00 AE */ lbzx r0, r5, r0 -/* 8030B584 98 06 00 01 */ stb r0, 1(r6) -/* 8030B588 48 00 00 64 */ b lbl_8030B5EC -lbl_8030B58C: -/* 8030B58C C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B590 90 E1 00 0C */ stw r7, 0xc(r1) -/* 8030B594 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B598 90 01 00 08 */ stw r0, 8(r1) -/* 8030B59C C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B5A0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B5A4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B5A8 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B5AC 40 82 00 20 */ bne lbl_8030B5CC -/* 8030B5B0 80 A3 00 30 */ lwz r5, 0x30(r3) -/* 8030B5B4 A0 04 00 06 */ lhz r0, 6(r4) -/* 8030B5B8 7C 05 02 14 */ add r0, r5, r0 -/* 8030B5BC 7C A0 3A 14 */ add r5, r0, r7 -/* 8030B5C0 88 05 FF FF */ lbz r0, -1(r5) -/* 8030B5C4 98 06 00 01 */ stb r0, 1(r6) -/* 8030B5C8 48 00 00 24 */ b lbl_8030B5EC -lbl_8030B5CC: -/* 8030B5CC 80 E3 00 30 */ lwz r7, 0x30(r3) -/* 8030B5D0 A0 A4 00 06 */ lhz r5, 6(r4) -/* 8030B5D4 FC 00 10 1E */ fctiwz f0, f2 -/* 8030B5D8 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B5DC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B5E0 7C 05 02 14 */ add r0, r5, r0 -/* 8030B5E4 7C 07 00 AE */ lbzx r0, r7, r0 -/* 8030B5E8 98 06 00 01 */ stb r0, 1(r6) -lbl_8030B5EC: -/* 8030B5EC A0 E4 00 08 */ lhz r7, 8(r4) -/* 8030B5F0 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030B5F4 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B5F8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B5FC 40 80 00 18 */ bge lbl_8030B614 -/* 8030B600 80 A3 00 34 */ lwz r5, 0x34(r3) -/* 8030B604 A0 04 00 0A */ lhz r0, 0xa(r4) -/* 8030B608 7C 05 00 AE */ lbzx r0, r5, r0 -/* 8030B60C 98 06 00 02 */ stb r0, 2(r6) -/* 8030B610 48 00 00 64 */ b lbl_8030B674 -lbl_8030B614: -/* 8030B614 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B618 90 E1 00 0C */ stw r7, 0xc(r1) -/* 8030B61C 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B620 90 01 00 08 */ stw r0, 8(r1) -/* 8030B624 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B628 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B62C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B630 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B634 40 82 00 20 */ bne lbl_8030B654 -/* 8030B638 80 A3 00 34 */ lwz r5, 0x34(r3) -/* 8030B63C A0 04 00 0A */ lhz r0, 0xa(r4) -/* 8030B640 7C 05 02 14 */ add r0, r5, r0 -/* 8030B644 7C A0 3A 14 */ add r5, r0, r7 -/* 8030B648 88 05 FF FF */ lbz r0, -1(r5) -/* 8030B64C 98 06 00 02 */ stb r0, 2(r6) -/* 8030B650 48 00 00 24 */ b lbl_8030B674 -lbl_8030B654: -/* 8030B654 80 E3 00 34 */ lwz r7, 0x34(r3) -/* 8030B658 A0 A4 00 0A */ lhz r5, 0xa(r4) -/* 8030B65C FC 00 10 1E */ fctiwz f0, f2 -/* 8030B660 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B664 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B668 7C 05 02 14 */ add r0, r5, r0 -/* 8030B66C 7C 07 00 AE */ lbzx r0, r7, r0 -/* 8030B670 98 06 00 02 */ stb r0, 2(r6) -lbl_8030B674: -/* 8030B674 A0 A4 00 0C */ lhz r5, 0xc(r4) -/* 8030B678 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030B67C C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030B680 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B684 40 80 00 18 */ bge lbl_8030B69C -/* 8030B688 80 63 00 38 */ lwz r3, 0x38(r3) -/* 8030B68C A0 04 00 0E */ lhz r0, 0xe(r4) -/* 8030B690 7C 03 00 AE */ lbzx r0, r3, r0 -/* 8030B694 98 06 00 03 */ stb r0, 3(r6) -/* 8030B698 48 00 00 64 */ b lbl_8030B6FC -lbl_8030B69C: -/* 8030B69C C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030B6A0 90 A1 00 0C */ stw r5, 0xc(r1) -/* 8030B6A4 3C 00 43 30 */ lis r0, 0x4330 -/* 8030B6A8 90 01 00 08 */ stw r0, 8(r1) -/* 8030B6AC C8 01 00 08 */ lfd f0, 8(r1) -/* 8030B6B0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030B6B4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030B6B8 4C 41 13 82 */ cror 2, 1, 2 -/* 8030B6BC 40 82 00 20 */ bne lbl_8030B6DC -/* 8030B6C0 80 63 00 38 */ lwz r3, 0x38(r3) -/* 8030B6C4 A0 04 00 0E */ lhz r0, 0xe(r4) -/* 8030B6C8 7C 03 02 14 */ add r0, r3, r0 -/* 8030B6CC 7C 60 2A 14 */ add r3, r0, r5 -/* 8030B6D0 88 03 FF FF */ lbz r0, -1(r3) -/* 8030B6D4 98 06 00 03 */ stb r0, 3(r6) -/* 8030B6D8 48 00 00 24 */ b lbl_8030B6FC -lbl_8030B6DC: -/* 8030B6DC 80 A3 00 38 */ lwz r5, 0x38(r3) -/* 8030B6E0 A0 64 00 0E */ lhz r3, 0xe(r4) -/* 8030B6E4 FC 00 10 1E */ fctiwz f0, f2 -/* 8030B6E8 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030B6EC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030B6F0 7C 03 02 14 */ add r0, r3, r0 -/* 8030B6F4 7C 05 00 AE */ lbzx r0, r5, r0 -/* 8030B6F8 98 06 00 03 */ stb r0, 3(r6) -lbl_8030B6FC: -/* 8030B6FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B700 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getPalette__16J2DAnmTexPatternCFUs.s b/asm/JSystem/J2DGraph/J2DAnimation/getPalette__16J2DAnmTexPatternCFUs.s deleted file mode 100644 index 40ceb02e663..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getPalette__16J2DAnmTexPatternCFUs.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8030BFF0: -/* 8030BFF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8030BFF4 7C 08 02 A6 */ mflr r0 -/* 8030BFF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8030BFFC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8030C000 7C 7F 1B 78 */ mr r31, r3 -/* 8030C004 80 03 00 30 */ lwz r0, 0x30(r3) -/* 8030C008 28 00 00 00 */ cmplwi r0, 0 -/* 8030C00C 40 82 00 0C */ bne lbl_8030C018 -/* 8030C010 38 60 00 00 */ li r3, 0 -/* 8030C014 48 00 00 20 */ b lbl_8030C034 -lbl_8030C018: -/* 8030C018 38 A1 00 08 */ addi r5, r1, 8 -/* 8030C01C 4B FF FE CD */ bl getTexNo__16J2DAnmTexPatternCFUsPUs -/* 8030C020 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8030C024 A0 01 00 08 */ lhz r0, 8(r1) -/* 8030C028 54 00 18 38 */ slwi r0, r0, 3 -/* 8030C02C 7C 63 02 14 */ add r3, r3, r0 -/* 8030C030 80 63 00 04 */ lwz r3, 4(r3) -lbl_8030C034: -/* 8030C034 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8030C038 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8030C03C 7C 08 03 A6 */ mtlr r0 -/* 8030C040 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030C044 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getResTIMG__16J2DAnmTexPatternCFUs.s b/asm/JSystem/J2DGraph/J2DAnimation/getResTIMG__16J2DAnmTexPatternCFUs.s deleted file mode 100644 index 9595a71b75b..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getResTIMG__16J2DAnmTexPatternCFUs.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8030BF9C: -/* 8030BF9C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8030BFA0 7C 08 02 A6 */ mflr r0 -/* 8030BFA4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8030BFA8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8030BFAC 7C 7F 1B 78 */ mr r31, r3 -/* 8030BFB0 80 03 00 30 */ lwz r0, 0x30(r3) -/* 8030BFB4 28 00 00 00 */ cmplwi r0, 0 -/* 8030BFB8 40 82 00 0C */ bne lbl_8030BFC4 -/* 8030BFBC 38 60 00 00 */ li r3, 0 -/* 8030BFC0 48 00 00 1C */ b lbl_8030BFDC -lbl_8030BFC4: -/* 8030BFC4 38 A1 00 08 */ addi r5, r1, 8 -/* 8030BFC8 4B FF FF 21 */ bl getTexNo__16J2DAnmTexPatternCFUsPUs -/* 8030BFCC 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8030BFD0 A0 01 00 08 */ lhz r0, 8(r1) -/* 8030BFD4 54 00 18 38 */ slwi r0, r0, 3 -/* 8030BFD8 7C 63 00 2E */ lwzx r3, r3, r0 -lbl_8030BFDC: -/* 8030BFDC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8030BFE0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8030BFE4 7C 08 03 A6 */ mtlr r0 -/* 8030BFE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030BFEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10.s b/asm/JSystem/J2DGraph/J2DAnimation/getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10.s deleted file mode 100644 index e51c0c39549..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10.s +++ /dev/null @@ -1,202 +0,0 @@ -lbl_8030C0F0: -/* 8030C0F0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8030C0F4 7C 08 02 A6 */ mflr r0 -/* 8030C0F8 90 01 00 44 */ stw r0, 0x44(r1) -/* 8030C0FC DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8030C100 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8030C104 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C108 48 05 60 D5 */ bl _savegpr_29 -/* 8030C10C 7C 7D 1B 78 */ mr r29, r3 -/* 8030C110 7C BE 2B 78 */ mr r30, r5 -/* 8030C114 80 63 00 4C */ lwz r3, 0x4c(r3) -/* 8030C118 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 8030C11C 1C 00 00 1C */ mulli r0, r0, 0x1c -/* 8030C120 7F E3 02 14 */ add r31, r3, r0 -/* 8030C124 A0 1F 00 00 */ lhz r0, 0(r31) -/* 8030C128 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C12C 41 82 00 20 */ beq lbl_8030C14C -/* 8030C130 40 80 00 34 */ bge lbl_8030C164 -/* 8030C134 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C138 40 80 00 08 */ bge lbl_8030C140 -/* 8030C13C 48 00 00 28 */ b lbl_8030C164 -lbl_8030C140: -/* 8030C140 38 00 00 00 */ li r0, 0 -/* 8030C144 B0 1E 00 00 */ sth r0, 0(r30) -/* 8030C148 48 00 00 78 */ b lbl_8030C1C0 -lbl_8030C14C: -/* 8030C14C 80 7D 00 54 */ lwz r3, 0x54(r29) -/* 8030C150 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030C154 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C158 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C15C B0 1E 00 00 */ sth r0, 0(r30) -/* 8030C160 48 00 00 60 */ b lbl_8030C1C0 -lbl_8030C164: -/* 8030C164 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C168 7F E3 FB 78 */ mr r3, r31 -/* 8030C16C 80 9D 00 54 */ lwz r4, 0x54(r29) -/* 8030C170 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030C174 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C178 7C 84 02 14 */ add r4, r4, r0 -/* 8030C17C 48 00 06 01 */ bl func_8030C77C -/* 8030C180 FF E0 08 90 */ fmr f31, f1 -/* 8030C184 C0 02 C9 18 */ lfs f0, lit_2110(r2) -/* 8030C188 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C18C 40 80 00 10 */ bge lbl_8030C19C -/* 8030C190 38 00 FC 00 */ li r0, -1024 -/* 8030C194 B0 1E 00 00 */ sth r0, 0(r30) -/* 8030C198 48 00 00 28 */ b lbl_8030C1C0 -lbl_8030C19C: -/* 8030C19C C0 02 C9 1C */ lfs f0, lit_2111(r2) -/* 8030C1A0 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C1A4 40 81 00 10 */ ble lbl_8030C1B4 -/* 8030C1A8 38 00 03 FF */ li r0, 0x3ff -/* 8030C1AC B0 1E 00 00 */ sth r0, 0(r30) -/* 8030C1B0 48 00 00 10 */ b lbl_8030C1C0 -lbl_8030C1B4: -/* 8030C1B4 F3 E1 D0 14 */ psq_st f31, 20(r1), 1, 5 /* qr5 */ -/* 8030C1B8 A8 01 00 14 */ lha r0, 0x14(r1) -/* 8030C1BC B0 1E 00 00 */ sth r0, 0(r30) -lbl_8030C1C0: -/* 8030C1C0 A0 1F 00 06 */ lhz r0, 6(r31) -/* 8030C1C4 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C1C8 41 82 00 20 */ beq lbl_8030C1E8 -/* 8030C1CC 40 80 00 34 */ bge lbl_8030C200 -/* 8030C1D0 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C1D4 40 80 00 08 */ bge lbl_8030C1DC -/* 8030C1D8 48 00 00 28 */ b lbl_8030C200 -lbl_8030C1DC: -/* 8030C1DC 38 00 00 00 */ li r0, 0 -/* 8030C1E0 B0 1E 00 02 */ sth r0, 2(r30) -/* 8030C1E4 48 00 00 78 */ b lbl_8030C25C -lbl_8030C1E8: -/* 8030C1E8 80 7D 00 58 */ lwz r3, 0x58(r29) -/* 8030C1EC A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030C1F0 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C1F4 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C1F8 B0 1E 00 02 */ sth r0, 2(r30) -/* 8030C1FC 48 00 00 60 */ b lbl_8030C25C -lbl_8030C200: -/* 8030C200 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C204 38 7F 00 06 */ addi r3, r31, 6 -/* 8030C208 80 9D 00 58 */ lwz r4, 0x58(r29) -/* 8030C20C A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030C210 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C214 7C 84 02 14 */ add r4, r4, r0 -/* 8030C218 48 00 05 65 */ bl func_8030C77C -/* 8030C21C FF E0 08 90 */ fmr f31, f1 -/* 8030C220 C0 02 C9 18 */ lfs f0, lit_2110(r2) -/* 8030C224 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C228 40 80 00 10 */ bge lbl_8030C238 -/* 8030C22C 38 00 FC 00 */ li r0, -1024 -/* 8030C230 B0 1E 00 02 */ sth r0, 2(r30) -/* 8030C234 48 00 00 28 */ b lbl_8030C25C -lbl_8030C238: -/* 8030C238 C0 02 C9 1C */ lfs f0, lit_2111(r2) -/* 8030C23C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C240 40 81 00 10 */ ble lbl_8030C250 -/* 8030C244 38 00 03 FF */ li r0, 0x3ff -/* 8030C248 B0 1E 00 02 */ sth r0, 2(r30) -/* 8030C24C 48 00 00 10 */ b lbl_8030C25C -lbl_8030C250: -/* 8030C250 F3 E1 D0 10 */ psq_st f31, 16(r1), 1, 5 /* qr5 */ -/* 8030C254 A8 01 00 10 */ lha r0, 0x10(r1) -/* 8030C258 B0 1E 00 02 */ sth r0, 2(r30) -lbl_8030C25C: -/* 8030C25C A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8030C260 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C264 41 82 00 20 */ beq lbl_8030C284 -/* 8030C268 40 80 00 34 */ bge lbl_8030C29C -/* 8030C26C 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C270 40 80 00 08 */ bge lbl_8030C278 -/* 8030C274 48 00 00 28 */ b lbl_8030C29C -lbl_8030C278: -/* 8030C278 38 00 00 00 */ li r0, 0 -/* 8030C27C B0 1E 00 04 */ sth r0, 4(r30) -/* 8030C280 48 00 00 78 */ b lbl_8030C2F8 -lbl_8030C284: -/* 8030C284 80 7D 00 5C */ lwz r3, 0x5c(r29) -/* 8030C288 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030C28C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C290 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C294 B0 1E 00 04 */ sth r0, 4(r30) -/* 8030C298 48 00 00 60 */ b lbl_8030C2F8 -lbl_8030C29C: -/* 8030C29C C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C2A0 38 7F 00 0C */ addi r3, r31, 0xc -/* 8030C2A4 80 9D 00 5C */ lwz r4, 0x5c(r29) -/* 8030C2A8 A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030C2AC 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C2B0 7C 84 02 14 */ add r4, r4, r0 -/* 8030C2B4 48 00 04 C9 */ bl func_8030C77C -/* 8030C2B8 FF E0 08 90 */ fmr f31, f1 -/* 8030C2BC C0 02 C9 18 */ lfs f0, lit_2110(r2) -/* 8030C2C0 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C2C4 40 80 00 10 */ bge lbl_8030C2D4 -/* 8030C2C8 38 00 FC 00 */ li r0, -1024 -/* 8030C2CC B0 1E 00 04 */ sth r0, 4(r30) -/* 8030C2D0 48 00 00 28 */ b lbl_8030C2F8 -lbl_8030C2D4: -/* 8030C2D4 C0 02 C9 1C */ lfs f0, lit_2111(r2) -/* 8030C2D8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C2DC 40 81 00 10 */ ble lbl_8030C2EC -/* 8030C2E0 38 00 03 FF */ li r0, 0x3ff -/* 8030C2E4 B0 1E 00 04 */ sth r0, 4(r30) -/* 8030C2E8 48 00 00 10 */ b lbl_8030C2F8 -lbl_8030C2EC: -/* 8030C2EC F3 E1 D0 0C */ psq_st f31, 12(r1), 1, 5 /* qr5 */ -/* 8030C2F0 A8 01 00 0C */ lha r0, 0xc(r1) -/* 8030C2F4 B0 1E 00 04 */ sth r0, 4(r30) -lbl_8030C2F8: -/* 8030C2F8 A0 1F 00 12 */ lhz r0, 0x12(r31) -/* 8030C2FC 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C300 41 82 00 20 */ beq lbl_8030C320 -/* 8030C304 40 80 00 34 */ bge lbl_8030C338 -/* 8030C308 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C30C 40 80 00 08 */ bge lbl_8030C314 -/* 8030C310 48 00 00 28 */ b lbl_8030C338 -lbl_8030C314: -/* 8030C314 38 00 00 00 */ li r0, 0 -/* 8030C318 B0 1E 00 06 */ sth r0, 6(r30) -/* 8030C31C 48 00 00 78 */ b lbl_8030C394 -lbl_8030C320: -/* 8030C320 80 7D 00 60 */ lwz r3, 0x60(r29) -/* 8030C324 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030C328 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C32C 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C330 B0 1E 00 06 */ sth r0, 6(r30) -/* 8030C334 48 00 00 60 */ b lbl_8030C394 -lbl_8030C338: -/* 8030C338 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C33C 38 7F 00 12 */ addi r3, r31, 0x12 -/* 8030C340 80 9D 00 60 */ lwz r4, 0x60(r29) -/* 8030C344 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030C348 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C34C 7C 84 02 14 */ add r4, r4, r0 -/* 8030C350 48 00 04 2D */ bl func_8030C77C -/* 8030C354 FF E0 08 90 */ fmr f31, f1 -/* 8030C358 C0 02 C9 18 */ lfs f0, lit_2110(r2) -/* 8030C35C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C360 40 80 00 10 */ bge lbl_8030C370 -/* 8030C364 38 00 FC 00 */ li r0, -1024 -/* 8030C368 B0 1E 00 06 */ sth r0, 6(r30) -/* 8030C36C 48 00 00 28 */ b lbl_8030C394 -lbl_8030C370: -/* 8030C370 C0 02 C9 1C */ lfs f0, lit_2111(r2) -/* 8030C374 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C378 40 81 00 10 */ ble lbl_8030C388 -/* 8030C37C 38 00 03 FF */ li r0, 0x3ff -/* 8030C380 B0 1E 00 06 */ sth r0, 6(r30) -/* 8030C384 48 00 00 10 */ b lbl_8030C394 -lbl_8030C388: -/* 8030C388 F3 E1 D0 08 */ psq_st f31, 8(r1), 1, 5 /* qr5 */ -/* 8030C38C A8 01 00 08 */ lha r0, 8(r1) -/* 8030C390 B0 1E 00 06 */ sth r0, 6(r30) -lbl_8030C394: -/* 8030C394 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8030C398 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8030C39C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C3A0 48 05 5E 89 */ bl _restgpr_29 -/* 8030C3A4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030C3A8 7C 08 03 A6 */ mtlr r0 -/* 8030C3AC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030C3B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor.s b/asm/JSystem/J2DGraph/J2DAnimation/getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor.s deleted file mode 100644 index 1f35069d9be..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor.s +++ /dev/null @@ -1,202 +0,0 @@ -lbl_8030C3B4: -/* 8030C3B4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8030C3B8 7C 08 02 A6 */ mflr r0 -/* 8030C3BC 90 01 00 44 */ stw r0, 0x44(r1) -/* 8030C3C0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8030C3C4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8030C3C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C3CC 48 05 5E 11 */ bl _savegpr_29 -/* 8030C3D0 7C 7D 1B 78 */ mr r29, r3 -/* 8030C3D4 7C BE 2B 78 */ mr r30, r5 -/* 8030C3D8 80 63 00 50 */ lwz r3, 0x50(r3) -/* 8030C3DC 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 8030C3E0 1C 00 00 1C */ mulli r0, r0, 0x1c -/* 8030C3E4 7F E3 02 14 */ add r31, r3, r0 -/* 8030C3E8 A0 1F 00 00 */ lhz r0, 0(r31) -/* 8030C3EC 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C3F0 41 82 00 20 */ beq lbl_8030C410 -/* 8030C3F4 40 80 00 34 */ bge lbl_8030C428 -/* 8030C3F8 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C3FC 40 80 00 08 */ bge lbl_8030C404 -/* 8030C400 48 00 00 28 */ b lbl_8030C428 -lbl_8030C404: -/* 8030C404 38 00 00 00 */ li r0, 0 -/* 8030C408 98 1E 00 00 */ stb r0, 0(r30) -/* 8030C40C 48 00 00 78 */ b lbl_8030C484 -lbl_8030C410: -/* 8030C410 80 7D 00 64 */ lwz r3, 0x64(r29) -/* 8030C414 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030C418 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C41C 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C420 98 1E 00 00 */ stb r0, 0(r30) -/* 8030C424 48 00 00 60 */ b lbl_8030C484 -lbl_8030C428: -/* 8030C428 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C42C 7F E3 FB 78 */ mr r3, r31 -/* 8030C430 80 9D 00 64 */ lwz r4, 0x64(r29) -/* 8030C434 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8030C438 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C43C 7C 84 02 14 */ add r4, r4, r0 -/* 8030C440 48 00 03 3D */ bl func_8030C77C -/* 8030C444 FF E0 08 90 */ fmr f31, f1 -/* 8030C448 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030C44C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C450 40 80 00 10 */ bge lbl_8030C460 -/* 8030C454 38 00 00 00 */ li r0, 0 -/* 8030C458 98 1E 00 00 */ stb r0, 0(r30) -/* 8030C45C 48 00 00 28 */ b lbl_8030C484 -lbl_8030C460: -/* 8030C460 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030C464 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C468 40 81 00 10 */ ble lbl_8030C478 -/* 8030C46C 38 00 00 FF */ li r0, 0xff -/* 8030C470 98 1E 00 00 */ stb r0, 0(r30) -/* 8030C474 48 00 00 10 */ b lbl_8030C484 -lbl_8030C478: -/* 8030C478 F3 E1 A0 14 */ psq_st f31, 20(r1), 1, 2 /* qr2 */ -/* 8030C47C 88 01 00 14 */ lbz r0, 0x14(r1) -/* 8030C480 98 1E 00 00 */ stb r0, 0(r30) -lbl_8030C484: -/* 8030C484 A0 1F 00 06 */ lhz r0, 6(r31) -/* 8030C488 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C48C 41 82 00 20 */ beq lbl_8030C4AC -/* 8030C490 40 80 00 34 */ bge lbl_8030C4C4 -/* 8030C494 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C498 40 80 00 08 */ bge lbl_8030C4A0 -/* 8030C49C 48 00 00 28 */ b lbl_8030C4C4 -lbl_8030C4A0: -/* 8030C4A0 38 00 00 00 */ li r0, 0 -/* 8030C4A4 98 1E 00 01 */ stb r0, 1(r30) -/* 8030C4A8 48 00 00 78 */ b lbl_8030C520 -lbl_8030C4AC: -/* 8030C4AC 80 7D 00 68 */ lwz r3, 0x68(r29) -/* 8030C4B0 A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030C4B4 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C4B8 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C4BC 98 1E 00 01 */ stb r0, 1(r30) -/* 8030C4C0 48 00 00 60 */ b lbl_8030C520 -lbl_8030C4C4: -/* 8030C4C4 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C4C8 38 7F 00 06 */ addi r3, r31, 6 -/* 8030C4CC 80 9D 00 68 */ lwz r4, 0x68(r29) -/* 8030C4D0 A0 1F 00 08 */ lhz r0, 8(r31) -/* 8030C4D4 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C4D8 7C 84 02 14 */ add r4, r4, r0 -/* 8030C4DC 48 00 02 A1 */ bl func_8030C77C -/* 8030C4E0 FF E0 08 90 */ fmr f31, f1 -/* 8030C4E4 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030C4E8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C4EC 40 80 00 10 */ bge lbl_8030C4FC -/* 8030C4F0 38 00 00 00 */ li r0, 0 -/* 8030C4F4 98 1E 00 01 */ stb r0, 1(r30) -/* 8030C4F8 48 00 00 28 */ b lbl_8030C520 -lbl_8030C4FC: -/* 8030C4FC C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030C500 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C504 40 81 00 10 */ ble lbl_8030C514 -/* 8030C508 38 00 00 FF */ li r0, 0xff -/* 8030C50C 98 1E 00 01 */ stb r0, 1(r30) -/* 8030C510 48 00 00 10 */ b lbl_8030C520 -lbl_8030C514: -/* 8030C514 F3 E1 A0 10 */ psq_st f31, 16(r1), 1, 2 /* qr2 */ -/* 8030C518 88 01 00 10 */ lbz r0, 0x10(r1) -/* 8030C51C 98 1E 00 01 */ stb r0, 1(r30) -lbl_8030C520: -/* 8030C520 A0 1F 00 0C */ lhz r0, 0xc(r31) -/* 8030C524 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C528 41 82 00 20 */ beq lbl_8030C548 -/* 8030C52C 40 80 00 34 */ bge lbl_8030C560 -/* 8030C530 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C534 40 80 00 08 */ bge lbl_8030C53C -/* 8030C538 48 00 00 28 */ b lbl_8030C560 -lbl_8030C53C: -/* 8030C53C 38 00 00 00 */ li r0, 0 -/* 8030C540 98 1E 00 02 */ stb r0, 2(r30) -/* 8030C544 48 00 00 78 */ b lbl_8030C5BC -lbl_8030C548: -/* 8030C548 80 7D 00 6C */ lwz r3, 0x6c(r29) -/* 8030C54C A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030C550 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C554 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C558 98 1E 00 02 */ stb r0, 2(r30) -/* 8030C55C 48 00 00 60 */ b lbl_8030C5BC -lbl_8030C560: -/* 8030C560 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C564 38 7F 00 0C */ addi r3, r31, 0xc -/* 8030C568 80 9D 00 6C */ lwz r4, 0x6c(r29) -/* 8030C56C A0 1F 00 0E */ lhz r0, 0xe(r31) -/* 8030C570 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C574 7C 84 02 14 */ add r4, r4, r0 -/* 8030C578 48 00 02 05 */ bl func_8030C77C -/* 8030C57C FF E0 08 90 */ fmr f31, f1 -/* 8030C580 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030C584 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C588 40 80 00 10 */ bge lbl_8030C598 -/* 8030C58C 38 00 00 00 */ li r0, 0 -/* 8030C590 98 1E 00 02 */ stb r0, 2(r30) -/* 8030C594 48 00 00 28 */ b lbl_8030C5BC -lbl_8030C598: -/* 8030C598 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030C59C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C5A0 40 81 00 10 */ ble lbl_8030C5B0 -/* 8030C5A4 38 00 00 FF */ li r0, 0xff -/* 8030C5A8 98 1E 00 02 */ stb r0, 2(r30) -/* 8030C5AC 48 00 00 10 */ b lbl_8030C5BC -lbl_8030C5B0: -/* 8030C5B0 F3 E1 A0 0C */ psq_st f31, 12(r1), 1, 2 /* qr2 */ -/* 8030C5B4 88 01 00 0C */ lbz r0, 0xc(r1) -/* 8030C5B8 98 1E 00 02 */ stb r0, 2(r30) -lbl_8030C5BC: -/* 8030C5BC A0 1F 00 12 */ lhz r0, 0x12(r31) -/* 8030C5C0 2C 00 00 01 */ cmpwi r0, 1 -/* 8030C5C4 41 82 00 20 */ beq lbl_8030C5E4 -/* 8030C5C8 40 80 00 34 */ bge lbl_8030C5FC -/* 8030C5CC 2C 00 00 00 */ cmpwi r0, 0 -/* 8030C5D0 40 80 00 08 */ bge lbl_8030C5D8 -/* 8030C5D4 48 00 00 28 */ b lbl_8030C5FC -lbl_8030C5D8: -/* 8030C5D8 38 00 00 00 */ li r0, 0 -/* 8030C5DC 98 1E 00 03 */ stb r0, 3(r30) -/* 8030C5E0 48 00 00 78 */ b lbl_8030C658 -lbl_8030C5E4: -/* 8030C5E4 80 7D 00 70 */ lwz r3, 0x70(r29) -/* 8030C5E8 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030C5EC 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C5F0 7C 03 02 AE */ lhax r0, r3, r0 -/* 8030C5F4 98 1E 00 03 */ stb r0, 3(r30) -/* 8030C5F8 48 00 00 60 */ b lbl_8030C658 -lbl_8030C5FC: -/* 8030C5FC C0 3D 00 08 */ lfs f1, 8(r29) -/* 8030C600 38 7F 00 12 */ addi r3, r31, 0x12 -/* 8030C604 80 9D 00 70 */ lwz r4, 0x70(r29) -/* 8030C608 A0 1F 00 14 */ lhz r0, 0x14(r31) -/* 8030C60C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030C610 7C 84 02 14 */ add r4, r4, r0 -/* 8030C614 48 00 01 69 */ bl func_8030C77C -/* 8030C618 FF E0 08 90 */ fmr f31, f1 -/* 8030C61C C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030C620 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C624 40 80 00 10 */ bge lbl_8030C634 -/* 8030C628 38 00 00 00 */ li r0, 0 -/* 8030C62C 98 1E 00 03 */ stb r0, 3(r30) -/* 8030C630 48 00 00 28 */ b lbl_8030C658 -lbl_8030C634: -/* 8030C634 C0 02 C9 14 */ lfs f0, lit_1748(r2) -/* 8030C638 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8030C63C 40 81 00 10 */ ble lbl_8030C64C -/* 8030C640 38 00 00 FF */ li r0, 0xff -/* 8030C644 98 1E 00 03 */ stb r0, 3(r30) -/* 8030C648 48 00 00 10 */ b lbl_8030C658 -lbl_8030C64C: -/* 8030C64C F3 E1 A0 08 */ psq_st f31, 8(r1), 1, 2 /* qr2 */ -/* 8030C650 88 01 00 08 */ lbz r0, 8(r1) -/* 8030C654 98 1E 00 03 */ stb r0, 3(r30) -lbl_8030C658: -/* 8030C658 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8030C65C CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8030C660 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C664 48 05 5B C5 */ bl _restgpr_29 -/* 8030C668 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030C66C 7C 08 03 A6 */ mtlr r0 -/* 8030C670 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030C674 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getTexNo__16J2DAnmTexPatternCFUsPUs.s b/asm/JSystem/J2DGraph/J2DAnimation/getTexNo__16J2DAnmTexPatternCFUsPUs.s deleted file mode 100644 index 0a7f5b23cbe..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getTexNo__16J2DAnmTexPatternCFUsPUs.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8030BEE8: -/* 8030BEE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030BEEC 81 03 00 14 */ lwz r8, 0x14(r3) -/* 8030BEF0 54 87 1B 78 */ rlwinm r7, r4, 3, 0xd, 0x1c -/* 8030BEF4 7C C8 3A 2E */ lhzx r6, r8, r7 -/* 8030BEF8 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030BEFC C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030BF00 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030BF04 40 80 00 20 */ bge lbl_8030BF24 -/* 8030BF08 80 83 00 10 */ lwz r4, 0x10(r3) -/* 8030BF0C 7C 68 3A 14 */ add r3, r8, r7 -/* 8030BF10 A0 03 00 02 */ lhz r0, 2(r3) -/* 8030BF14 54 00 08 3C */ slwi r0, r0, 1 -/* 8030BF18 7C 04 02 2E */ lhzx r0, r4, r0 -/* 8030BF1C B0 05 00 00 */ sth r0, 0(r5) -/* 8030BF20 48 00 00 74 */ b lbl_8030BF94 -lbl_8030BF24: -/* 8030BF24 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030BF28 90 C1 00 0C */ stw r6, 0xc(r1) -/* 8030BF2C 3C 00 43 30 */ lis r0, 0x4330 -/* 8030BF30 90 01 00 08 */ stw r0, 8(r1) -/* 8030BF34 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030BF38 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030BF3C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030BF40 4C 41 13 82 */ cror 2, 1, 2 -/* 8030BF44 40 82 00 28 */ bne lbl_8030BF6C -/* 8030BF48 80 83 00 10 */ lwz r4, 0x10(r3) -/* 8030BF4C 7C 68 3A 14 */ add r3, r8, r7 -/* 8030BF50 A0 03 00 02 */ lhz r0, 2(r3) -/* 8030BF54 7C 66 02 14 */ add r3, r6, r0 -/* 8030BF58 38 03 FF FF */ addi r0, r3, -1 -/* 8030BF5C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030BF60 7C 04 02 2E */ lhzx r0, r4, r0 -/* 8030BF64 B0 05 00 00 */ sth r0, 0(r5) -/* 8030BF68 48 00 00 2C */ b lbl_8030BF94 -lbl_8030BF6C: -/* 8030BF6C 80 C3 00 10 */ lwz r6, 0x10(r3) -/* 8030BF70 FC 00 10 1E */ fctiwz f0, f2 -/* 8030BF74 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030BF78 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8030BF7C 7C 68 3A 14 */ add r3, r8, r7 -/* 8030BF80 A0 03 00 02 */ lhz r0, 2(r3) -/* 8030BF84 7C 04 02 14 */ add r0, r4, r0 -/* 8030BF88 54 00 08 3C */ slwi r0, r0, 1 -/* 8030BF8C 7C 06 02 2E */ lhzx r0, r6, r0 -/* 8030BF90 B0 05 00 00 */ sth r0, 0(r5) -lbl_8030BF94: -/* 8030BF94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BF98 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo.s b/asm/JSystem/J2DGraph/J2DAnimation/getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo.s deleted file mode 100644 index c7492a0b3e2..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8030CD7C: -/* 8030CD7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030CD80 7C 08 02 A6 */ mflr r0 -/* 8030CD84 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CD88 C0 23 00 08 */ lfs f1, 8(r3) -/* 8030CD8C 81 83 00 00 */ lwz r12, 0(r3) -/* 8030CD90 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8030CD94 7D 89 03 A6 */ mtctr r12 -/* 8030CD98 4E 80 04 21 */ bctrl -/* 8030CD9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030CDA0 7C 08 03 A6 */ mtlr r0 -/* 8030CDA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CDA8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo.s b/asm/JSystem/J2DGraph/J2DAnimation/getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo.s deleted file mode 100644 index f45abba077a..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo.s +++ /dev/null @@ -1,375 +0,0 @@ -lbl_8030A590: -/* 8030A590 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030A594 1C 04 00 03 */ mulli r0, r4, 3 -/* 8030A598 54 08 04 3E */ clrlwi r8, r0, 0x10 -/* 8030A59C 80 E3 00 24 */ lwz r7, 0x24(r3) -/* 8030A5A0 1C 08 00 0C */ mulli r0, r8, 0xc -/* 8030A5A4 7C 87 02 14 */ add r4, r7, r0 -/* 8030A5A8 38 08 00 01 */ addi r0, r8, 1 -/* 8030A5AC 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8030A5B0 7C C7 02 14 */ add r6, r7, r0 -/* 8030A5B4 38 08 00 02 */ addi r0, r8, 2 -/* 8030A5B8 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8030A5BC 7C E7 02 14 */ add r7, r7, r0 -/* 8030A5C0 A1 04 00 00 */ lhz r8, 0(r4) -/* 8030A5C4 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A5C8 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A5CC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A5D0 40 80 00 1C */ bge lbl_8030A5EC -/* 8030A5D4 81 03 00 10 */ lwz r8, 0x10(r3) -/* 8030A5D8 A0 04 00 02 */ lhz r0, 2(r4) -/* 8030A5DC 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A5E0 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030A5E4 D0 05 00 00 */ stfs f0, 0(r5) -/* 8030A5E8 48 00 00 6C */ b lbl_8030A654 -lbl_8030A5EC: -/* 8030A5EC C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A5F0 91 01 00 0C */ stw r8, 0xc(r1) -/* 8030A5F4 3C 00 43 30 */ lis r0, 0x4330 -/* 8030A5F8 90 01 00 08 */ stw r0, 8(r1) -/* 8030A5FC C8 01 00 08 */ lfd f0, 8(r1) -/* 8030A600 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030A604 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A608 4C 41 13 82 */ cror 2, 1, 2 -/* 8030A60C 40 82 00 24 */ bne lbl_8030A630 -/* 8030A610 81 23 00 10 */ lwz r9, 0x10(r3) -/* 8030A614 A0 04 00 02 */ lhz r0, 2(r4) -/* 8030A618 7D 08 02 14 */ add r8, r8, r0 -/* 8030A61C 38 08 FF FF */ addi r0, r8, -1 -/* 8030A620 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A624 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8030A628 D0 05 00 00 */ stfs f0, 0(r5) -/* 8030A62C 48 00 00 28 */ b lbl_8030A654 -lbl_8030A630: -/* 8030A630 81 23 00 10 */ lwz r9, 0x10(r3) -/* 8030A634 A1 04 00 02 */ lhz r8, 2(r4) -/* 8030A638 FC 00 10 1E */ fctiwz f0, f2 -/* 8030A63C D8 01 00 08 */ stfd f0, 8(r1) -/* 8030A640 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030A644 7C 08 02 14 */ add r0, r8, r0 -/* 8030A648 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A64C 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8030A650 D0 05 00 00 */ stfs f0, 0(r5) -lbl_8030A654: -/* 8030A654 A1 06 00 00 */ lhz r8, 0(r6) -/* 8030A658 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A65C C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A660 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A664 40 80 00 1C */ bge lbl_8030A680 -/* 8030A668 81 03 00 10 */ lwz r8, 0x10(r3) -/* 8030A66C A0 06 00 02 */ lhz r0, 2(r6) -/* 8030A670 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A674 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030A678 D0 05 00 04 */ stfs f0, 4(r5) -/* 8030A67C 48 00 00 6C */ b lbl_8030A6E8 -lbl_8030A680: -/* 8030A680 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A684 91 01 00 0C */ stw r8, 0xc(r1) -/* 8030A688 3C 00 43 30 */ lis r0, 0x4330 -/* 8030A68C 90 01 00 08 */ stw r0, 8(r1) -/* 8030A690 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030A694 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030A698 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A69C 4C 41 13 82 */ cror 2, 1, 2 -/* 8030A6A0 40 82 00 24 */ bne lbl_8030A6C4 -/* 8030A6A4 81 23 00 10 */ lwz r9, 0x10(r3) -/* 8030A6A8 A0 06 00 02 */ lhz r0, 2(r6) -/* 8030A6AC 7D 08 02 14 */ add r8, r8, r0 -/* 8030A6B0 38 08 FF FF */ addi r0, r8, -1 -/* 8030A6B4 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A6B8 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8030A6BC D0 05 00 04 */ stfs f0, 4(r5) -/* 8030A6C0 48 00 00 28 */ b lbl_8030A6E8 -lbl_8030A6C4: -/* 8030A6C4 81 23 00 10 */ lwz r9, 0x10(r3) -/* 8030A6C8 A1 06 00 02 */ lhz r8, 2(r6) -/* 8030A6CC FC 00 10 1E */ fctiwz f0, f2 -/* 8030A6D0 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030A6D4 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030A6D8 7C 08 02 14 */ add r0, r8, r0 -/* 8030A6DC 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A6E0 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8030A6E4 D0 05 00 04 */ stfs f0, 4(r5) -lbl_8030A6E8: -/* 8030A6E8 A1 07 00 00 */ lhz r8, 0(r7) -/* 8030A6EC C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A6F0 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A6F4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A6F8 40 80 00 1C */ bge lbl_8030A714 -/* 8030A6FC 81 03 00 10 */ lwz r8, 0x10(r3) -/* 8030A700 A0 07 00 02 */ lhz r0, 2(r7) -/* 8030A704 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A708 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030A70C D0 05 00 08 */ stfs f0, 8(r5) -/* 8030A710 48 00 00 6C */ b lbl_8030A77C -lbl_8030A714: -/* 8030A714 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A718 91 01 00 0C */ stw r8, 0xc(r1) -/* 8030A71C 3C 00 43 30 */ lis r0, 0x4330 -/* 8030A720 90 01 00 08 */ stw r0, 8(r1) -/* 8030A724 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030A728 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030A72C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A730 4C 41 13 82 */ cror 2, 1, 2 -/* 8030A734 40 82 00 24 */ bne lbl_8030A758 -/* 8030A738 81 23 00 10 */ lwz r9, 0x10(r3) -/* 8030A73C A0 07 00 02 */ lhz r0, 2(r7) -/* 8030A740 7D 08 02 14 */ add r8, r8, r0 -/* 8030A744 38 08 FF FF */ addi r0, r8, -1 -/* 8030A748 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A74C 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8030A750 D0 05 00 08 */ stfs f0, 8(r5) -/* 8030A754 48 00 00 28 */ b lbl_8030A77C -lbl_8030A758: -/* 8030A758 81 23 00 10 */ lwz r9, 0x10(r3) -/* 8030A75C A1 07 00 02 */ lhz r8, 2(r7) -/* 8030A760 FC 00 10 1E */ fctiwz f0, f2 -/* 8030A764 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030A768 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030A76C 7C 08 02 14 */ add r0, r8, r0 -/* 8030A770 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A774 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8030A778 D0 05 00 08 */ stfs f0, 8(r5) -lbl_8030A77C: -/* 8030A77C A1 04 00 04 */ lhz r8, 4(r4) -/* 8030A780 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A784 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A788 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A78C 40 80 00 1C */ bge lbl_8030A7A8 -/* 8030A790 81 03 00 14 */ lwz r8, 0x14(r3) -/* 8030A794 A0 04 00 06 */ lhz r0, 6(r4) -/* 8030A798 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A79C 7C 08 02 AE */ lhax r0, r8, r0 -/* 8030A7A0 B0 05 00 0C */ sth r0, 0xc(r5) -/* 8030A7A4 48 00 00 6C */ b lbl_8030A810 -lbl_8030A7A8: -/* 8030A7A8 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A7AC 91 01 00 0C */ stw r8, 0xc(r1) -/* 8030A7B0 3C 00 43 30 */ lis r0, 0x4330 -/* 8030A7B4 90 01 00 08 */ stw r0, 8(r1) -/* 8030A7B8 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030A7BC EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030A7C0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A7C4 4C 41 13 82 */ cror 2, 1, 2 -/* 8030A7C8 40 82 00 24 */ bne lbl_8030A7EC -/* 8030A7CC 81 23 00 14 */ lwz r9, 0x14(r3) -/* 8030A7D0 A0 04 00 06 */ lhz r0, 6(r4) -/* 8030A7D4 7D 08 02 14 */ add r8, r8, r0 -/* 8030A7D8 38 08 FF FF */ addi r0, r8, -1 -/* 8030A7DC 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A7E0 7C 09 02 AE */ lhax r0, r9, r0 -/* 8030A7E4 B0 05 00 0C */ sth r0, 0xc(r5) -/* 8030A7E8 48 00 00 28 */ b lbl_8030A810 -lbl_8030A7EC: -/* 8030A7EC 81 23 00 14 */ lwz r9, 0x14(r3) -/* 8030A7F0 A1 04 00 06 */ lhz r8, 6(r4) -/* 8030A7F4 FC 00 10 1E */ fctiwz f0, f2 -/* 8030A7F8 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030A7FC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030A800 7C 08 02 14 */ add r0, r8, r0 -/* 8030A804 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A808 7C 09 02 AE */ lhax r0, r9, r0 -/* 8030A80C B0 05 00 0C */ sth r0, 0xc(r5) -lbl_8030A810: -/* 8030A810 A1 06 00 04 */ lhz r8, 4(r6) -/* 8030A814 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A818 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A81C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A820 40 80 00 1C */ bge lbl_8030A83C -/* 8030A824 81 03 00 14 */ lwz r8, 0x14(r3) -/* 8030A828 A0 06 00 06 */ lhz r0, 6(r6) -/* 8030A82C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A830 7C 08 02 AE */ lhax r0, r8, r0 -/* 8030A834 B0 05 00 0E */ sth r0, 0xe(r5) -/* 8030A838 48 00 00 6C */ b lbl_8030A8A4 -lbl_8030A83C: -/* 8030A83C C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A840 91 01 00 0C */ stw r8, 0xc(r1) -/* 8030A844 3C 00 43 30 */ lis r0, 0x4330 -/* 8030A848 90 01 00 08 */ stw r0, 8(r1) -/* 8030A84C C8 01 00 08 */ lfd f0, 8(r1) -/* 8030A850 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030A854 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A858 4C 41 13 82 */ cror 2, 1, 2 -/* 8030A85C 40 82 00 24 */ bne lbl_8030A880 -/* 8030A860 81 23 00 14 */ lwz r9, 0x14(r3) -/* 8030A864 A0 06 00 06 */ lhz r0, 6(r6) -/* 8030A868 7D 08 02 14 */ add r8, r8, r0 -/* 8030A86C 38 08 FF FF */ addi r0, r8, -1 -/* 8030A870 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A874 7C 09 02 AE */ lhax r0, r9, r0 -/* 8030A878 B0 05 00 0E */ sth r0, 0xe(r5) -/* 8030A87C 48 00 00 28 */ b lbl_8030A8A4 -lbl_8030A880: -/* 8030A880 81 23 00 14 */ lwz r9, 0x14(r3) -/* 8030A884 A1 06 00 06 */ lhz r8, 6(r6) -/* 8030A888 FC 00 10 1E */ fctiwz f0, f2 -/* 8030A88C D8 01 00 08 */ stfd f0, 8(r1) -/* 8030A890 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030A894 7C 08 02 14 */ add r0, r8, r0 -/* 8030A898 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A89C 7C 09 02 AE */ lhax r0, r9, r0 -/* 8030A8A0 B0 05 00 0E */ sth r0, 0xe(r5) -lbl_8030A8A4: -/* 8030A8A4 A1 07 00 04 */ lhz r8, 4(r7) -/* 8030A8A8 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A8AC C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A8B0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A8B4 40 80 00 1C */ bge lbl_8030A8D0 -/* 8030A8B8 81 03 00 14 */ lwz r8, 0x14(r3) -/* 8030A8BC A0 07 00 06 */ lhz r0, 6(r7) -/* 8030A8C0 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A8C4 7C 08 02 AE */ lhax r0, r8, r0 -/* 8030A8C8 B0 05 00 10 */ sth r0, 0x10(r5) -/* 8030A8CC 48 00 00 6C */ b lbl_8030A938 -lbl_8030A8D0: -/* 8030A8D0 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A8D4 91 01 00 0C */ stw r8, 0xc(r1) -/* 8030A8D8 3C 00 43 30 */ lis r0, 0x4330 -/* 8030A8DC 90 01 00 08 */ stw r0, 8(r1) -/* 8030A8E0 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030A8E4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030A8E8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A8EC 4C 41 13 82 */ cror 2, 1, 2 -/* 8030A8F0 40 82 00 24 */ bne lbl_8030A914 -/* 8030A8F4 81 23 00 14 */ lwz r9, 0x14(r3) -/* 8030A8F8 A0 07 00 06 */ lhz r0, 6(r7) -/* 8030A8FC 7D 08 02 14 */ add r8, r8, r0 -/* 8030A900 38 08 FF FF */ addi r0, r8, -1 -/* 8030A904 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A908 7C 09 02 AE */ lhax r0, r9, r0 -/* 8030A90C B0 05 00 10 */ sth r0, 0x10(r5) -/* 8030A910 48 00 00 28 */ b lbl_8030A938 -lbl_8030A914: -/* 8030A914 81 23 00 14 */ lwz r9, 0x14(r3) -/* 8030A918 A1 07 00 06 */ lhz r8, 6(r7) -/* 8030A91C FC 00 10 1E */ fctiwz f0, f2 -/* 8030A920 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030A924 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030A928 7C 08 02 14 */ add r0, r8, r0 -/* 8030A92C 54 00 08 3C */ slwi r0, r0, 1 -/* 8030A930 7C 09 02 AE */ lhax r0, r9, r0 -/* 8030A934 B0 05 00 10 */ sth r0, 0x10(r5) -lbl_8030A938: -/* 8030A938 A1 24 00 08 */ lhz r9, 8(r4) -/* 8030A93C C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A940 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A944 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A948 40 80 00 1C */ bge lbl_8030A964 -/* 8030A94C 81 03 00 18 */ lwz r8, 0x18(r3) -/* 8030A950 A0 04 00 0A */ lhz r0, 0xa(r4) -/* 8030A954 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A958 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030A95C D0 05 00 14 */ stfs f0, 0x14(r5) -/* 8030A960 48 00 00 6C */ b lbl_8030A9CC -lbl_8030A964: -/* 8030A964 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A968 91 21 00 0C */ stw r9, 0xc(r1) -/* 8030A96C 3C 00 43 30 */ lis r0, 0x4330 -/* 8030A970 90 01 00 08 */ stw r0, 8(r1) -/* 8030A974 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030A978 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030A97C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A980 4C 41 13 82 */ cror 2, 1, 2 -/* 8030A984 40 82 00 24 */ bne lbl_8030A9A8 -/* 8030A988 81 03 00 18 */ lwz r8, 0x18(r3) -/* 8030A98C A0 04 00 0A */ lhz r0, 0xa(r4) -/* 8030A990 7C 89 02 14 */ add r4, r9, r0 -/* 8030A994 38 04 FF FF */ addi r0, r4, -1 -/* 8030A998 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A99C 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030A9A0 D0 05 00 14 */ stfs f0, 0x14(r5) -/* 8030A9A4 48 00 00 28 */ b lbl_8030A9CC -lbl_8030A9A8: -/* 8030A9A8 81 03 00 18 */ lwz r8, 0x18(r3) -/* 8030A9AC A0 84 00 0A */ lhz r4, 0xa(r4) -/* 8030A9B0 FC 00 10 1E */ fctiwz f0, f2 -/* 8030A9B4 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030A9B8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030A9BC 7C 04 02 14 */ add r0, r4, r0 -/* 8030A9C0 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A9C4 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030A9C8 D0 05 00 14 */ stfs f0, 0x14(r5) -lbl_8030A9CC: -/* 8030A9CC A0 86 00 08 */ lhz r4, 8(r6) -/* 8030A9D0 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030A9D4 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030A9D8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030A9DC 40 80 00 1C */ bge lbl_8030A9F8 -/* 8030A9E0 80 83 00 18 */ lwz r4, 0x18(r3) -/* 8030A9E4 A0 06 00 0A */ lhz r0, 0xa(r6) -/* 8030A9E8 54 00 10 3A */ slwi r0, r0, 2 -/* 8030A9EC 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8030A9F0 D0 05 00 18 */ stfs f0, 0x18(r5) -/* 8030A9F4 48 00 00 6C */ b lbl_8030AA60 -lbl_8030A9F8: -/* 8030A9F8 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030A9FC 90 81 00 0C */ stw r4, 0xc(r1) -/* 8030AA00 3C 00 43 30 */ lis r0, 0x4330 -/* 8030AA04 90 01 00 08 */ stw r0, 8(r1) -/* 8030AA08 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030AA0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030AA10 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030AA14 4C 41 13 82 */ cror 2, 1, 2 -/* 8030AA18 40 82 00 24 */ bne lbl_8030AA3C -/* 8030AA1C 81 03 00 18 */ lwz r8, 0x18(r3) -/* 8030AA20 A0 06 00 0A */ lhz r0, 0xa(r6) -/* 8030AA24 7C 84 02 14 */ add r4, r4, r0 -/* 8030AA28 38 04 FF FF */ addi r0, r4, -1 -/* 8030AA2C 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AA30 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030AA34 D0 05 00 18 */ stfs f0, 0x18(r5) -/* 8030AA38 48 00 00 28 */ b lbl_8030AA60 -lbl_8030AA3C: -/* 8030AA3C 81 03 00 18 */ lwz r8, 0x18(r3) -/* 8030AA40 A0 86 00 0A */ lhz r4, 0xa(r6) -/* 8030AA44 FC 00 10 1E */ fctiwz f0, f2 -/* 8030AA48 D8 01 00 08 */ stfd f0, 8(r1) -/* 8030AA4C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030AA50 7C 04 02 14 */ add r0, r4, r0 -/* 8030AA54 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AA58 7C 08 04 2E */ lfsx f0, r8, r0 -/* 8030AA5C D0 05 00 18 */ stfs f0, 0x18(r5) -lbl_8030AA60: -/* 8030AA60 A0 C7 00 08 */ lhz r6, 8(r7) -/* 8030AA64 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030AA68 C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030AA6C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030AA70 40 80 00 1C */ bge lbl_8030AA8C -/* 8030AA74 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8030AA78 A0 07 00 0A */ lhz r0, 0xa(r7) -/* 8030AA7C 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AA80 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8030AA84 D0 05 00 1C */ stfs f0, 0x1c(r5) -/* 8030AA88 48 00 00 6C */ b lbl_8030AAF4 -lbl_8030AA8C: -/* 8030AA8C C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030AA90 90 C1 00 0C */ stw r6, 0xc(r1) -/* 8030AA94 3C 00 43 30 */ lis r0, 0x4330 -/* 8030AA98 90 01 00 08 */ stw r0, 8(r1) -/* 8030AA9C C8 01 00 08 */ lfd f0, 8(r1) -/* 8030AAA0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030AAA4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030AAA8 4C 41 13 82 */ cror 2, 1, 2 -/* 8030AAAC 40 82 00 24 */ bne lbl_8030AAD0 -/* 8030AAB0 80 83 00 18 */ lwz r4, 0x18(r3) -/* 8030AAB4 A0 07 00 0A */ lhz r0, 0xa(r7) -/* 8030AAB8 7C 66 02 14 */ add r3, r6, r0 -/* 8030AABC 38 03 FF FF */ addi r0, r3, -1 -/* 8030AAC0 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AAC4 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8030AAC8 D0 05 00 1C */ stfs f0, 0x1c(r5) -/* 8030AACC 48 00 00 28 */ b lbl_8030AAF4 -lbl_8030AAD0: -/* 8030AAD0 80 83 00 18 */ lwz r4, 0x18(r3) -/* 8030AAD4 A0 67 00 0A */ lhz r3, 0xa(r7) -/* 8030AAD8 FC 00 10 1E */ fctiwz f0, f2 -/* 8030AADC D8 01 00 08 */ stfd f0, 8(r1) -/* 8030AAE0 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030AAE4 7C 03 02 14 */ add r0, r3, r0 -/* 8030AAE8 54 00 10 3A */ slwi r0, r0, 2 -/* 8030AAEC 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8030AAF0 D0 05 00 1C */ stfs f0, 0x1c(r5) -lbl_8030AAF4: -/* 8030AAF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030AAF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/getVisibility__20J2DAnmVisibilityFullCFUsPUc.s b/asm/JSystem/J2DGraph/J2DAnimation/getVisibility__20J2DAnmVisibilityFullCFUsPUc.s deleted file mode 100644 index f8efa04036a..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/getVisibility__20J2DAnmVisibilityFullCFUsPUc.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8030C048: -/* 8030C048 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030C04C 81 03 00 14 */ lwz r8, 0x14(r3) -/* 8030C050 54 87 13 BA */ rlwinm r7, r4, 2, 0xe, 0x1d -/* 8030C054 7C 88 3A 2E */ lhzx r4, r8, r7 -/* 8030C058 C0 43 00 08 */ lfs f2, 8(r3) -/* 8030C05C C0 02 C9 00 */ lfs f0, lit_1573(r2) -/* 8030C060 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030C064 40 80 00 1C */ bge lbl_8030C080 -/* 8030C068 80 83 00 18 */ lwz r4, 0x18(r3) -/* 8030C06C 7C 68 3A 14 */ add r3, r8, r7 -/* 8030C070 A0 03 00 02 */ lhz r0, 2(r3) -/* 8030C074 7C 04 00 AE */ lbzx r0, r4, r0 -/* 8030C078 98 05 00 00 */ stb r0, 0(r5) -/* 8030C07C 48 00 00 6C */ b lbl_8030C0E8 -lbl_8030C080: -/* 8030C080 C8 22 C9 08 */ lfd f1, lit_1576(r2) -/* 8030C084 90 81 00 0C */ stw r4, 0xc(r1) -/* 8030C088 3C 00 43 30 */ lis r0, 0x4330 -/* 8030C08C 90 01 00 08 */ stw r0, 8(r1) -/* 8030C090 C8 01 00 08 */ lfd f0, 8(r1) -/* 8030C094 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030C098 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030C09C 4C 41 13 82 */ cror 2, 1, 2 -/* 8030C0A0 40 82 00 24 */ bne lbl_8030C0C4 -/* 8030C0A4 80 03 00 18 */ lwz r0, 0x18(r3) -/* 8030C0A8 7C 80 22 14 */ add r4, r0, r4 -/* 8030C0AC 7C 68 3A 14 */ add r3, r8, r7 -/* 8030C0B0 A0 03 00 02 */ lhz r0, 2(r3) -/* 8030C0B4 7C 64 02 14 */ add r3, r4, r0 -/* 8030C0B8 88 03 FF FF */ lbz r0, -1(r3) -/* 8030C0BC 98 05 00 00 */ stb r0, 0(r5) -/* 8030C0C0 48 00 00 28 */ b lbl_8030C0E8 -lbl_8030C0C4: -/* 8030C0C4 80 C3 00 18 */ lwz r6, 0x18(r3) -/* 8030C0C8 FC 00 10 1E */ fctiwz f0, f2 -/* 8030C0CC D8 01 00 08 */ stfd f0, 8(r1) -/* 8030C0D0 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8030C0D4 7C 68 3A 14 */ add r3, r8, r7 -/* 8030C0D8 A0 03 00 02 */ lhz r0, 2(r3) -/* 8030C0DC 7C 04 02 14 */ add r0, r4, r0 -/* 8030C0E0 7C 06 00 AE */ lbzx r0, r6, r0 -/* 8030C0E4 98 05 00 00 */ stb r0, 0(r5) -lbl_8030C0E8: -/* 8030C0E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C0EC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen.s b/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen.s deleted file mode 100644 index 60ce60bc726..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8030AF24: -/* 8030AF24 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8030AF28 7C 08 02 A6 */ mflr r0 -/* 8030AF2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8030AF30 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030AF34 48 05 72 A9 */ bl _savegpr_29 -/* 8030AF38 7C 7D 1B 78 */ mr r29, r3 -/* 8030AF3C 7C 9E 23 79 */ or. r30, r4, r4 -/* 8030AF40 41 82 00 70 */ beq lbl_8030AFB0 -/* 8030AF44 80 1E 01 10 */ lwz r0, 0x110(r30) -/* 8030AF48 28 00 00 00 */ cmplwi r0, 0 -/* 8030AF4C 41 82 00 64 */ beq lbl_8030AFB0 -/* 8030AF50 3B E0 00 00 */ li r31, 0 -/* 8030AF54 48 00 00 4C */ b lbl_8030AFA0 -lbl_8030AF58: -/* 8030AF58 38 7D 00 20 */ addi r3, r29, 0x20 -/* 8030AF5C 7F E4 FB 78 */ mr r4, r31 -/* 8030AF60 4B FD 3B 99 */ bl getName__10JUTNameTabCFUs -/* 8030AF64 7C 64 1B 78 */ mr r4, r3 -/* 8030AF68 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8030AF6C 4B FD 3A ED */ bl getIndex__10JUTNameTabCFPCc -/* 8030AF70 2C 03 FF FF */ cmpwi r3, -1 -/* 8030AF74 41 82 00 14 */ beq lbl_8030AF88 -/* 8030AF78 80 9D 00 1C */ lwz r4, 0x1c(r29) -/* 8030AF7C 57 E0 0B FC */ rlwinm r0, r31, 1, 0xf, 0x1e -/* 8030AF80 7C 64 03 2E */ sthx r3, r4, r0 -/* 8030AF84 48 00 00 18 */ b lbl_8030AF9C -lbl_8030AF88: -/* 8030AF88 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8030AF8C 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8030AF90 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 8030AF94 57 E0 0B FC */ rlwinm r0, r31, 1, 0xf, 0x1e -/* 8030AF98 7C 83 03 2E */ sthx r4, r3, r0 -lbl_8030AF9C: -/* 8030AF9C 3B FF 00 01 */ addi r31, r31, 1 -lbl_8030AFA0: -/* 8030AFA0 57 E3 04 3E */ clrlwi r3, r31, 0x10 -/* 8030AFA4 A0 1D 00 18 */ lhz r0, 0x18(r29) -/* 8030AFA8 7C 03 00 40 */ cmplw r3, r0 -/* 8030AFAC 41 80 FF AC */ blt lbl_8030AF58 -lbl_8030AFB0: -/* 8030AFB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030AFB4 48 05 72 75 */ bl _restgpr_29 -/* 8030AFB8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8030AFBC 7C 08 03 A6 */ mtlr r0 -/* 8030AFC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030AFC4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen.s b/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen.s deleted file mode 100644 index 06ff167d3d2..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_8030C678: -/* 8030C678 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8030C67C 7C 08 02 A6 */ mflr r0 -/* 8030C680 90 01 00 24 */ stw r0, 0x24(r1) -/* 8030C684 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030C688 48 05 5B 55 */ bl _savegpr_29 -/* 8030C68C 7C 7E 1B 78 */ mr r30, r3 -/* 8030C690 7C 9F 23 79 */ or. r31, r4, r4 -/* 8030C694 41 82 00 D0 */ beq lbl_8030C764 -/* 8030C698 80 1F 01 10 */ lwz r0, 0x110(r31) -/* 8030C69C 28 00 00 00 */ cmplwi r0, 0 -/* 8030C6A0 41 82 00 C4 */ beq lbl_8030C764 -/* 8030C6A4 3B A0 00 00 */ li r29, 0 -/* 8030C6A8 48 00 00 4C */ b lbl_8030C6F4 -lbl_8030C6AC: -/* 8030C6AC 38 7E 00 28 */ addi r3, r30, 0x28 -/* 8030C6B0 7F A4 EB 78 */ mr r4, r29 -/* 8030C6B4 4B FD 24 45 */ bl getName__10JUTNameTabCFUs -/* 8030C6B8 7C 64 1B 78 */ mr r4, r3 -/* 8030C6BC 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 8030C6C0 4B FD 23 99 */ bl getIndex__10JUTNameTabCFPCc -/* 8030C6C4 2C 03 FF FF */ cmpwi r3, -1 -/* 8030C6C8 41 82 00 14 */ beq lbl_8030C6DC -/* 8030C6CC 80 9E 00 24 */ lwz r4, 0x24(r30) -/* 8030C6D0 57 A0 0B FC */ rlwinm r0, r29, 1, 0xf, 0x1e -/* 8030C6D4 7C 64 03 2E */ sthx r3, r4, r0 -/* 8030C6D8 48 00 00 18 */ b lbl_8030C6F0 -lbl_8030C6DC: -/* 8030C6DC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8030C6E0 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8030C6E4 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 8030C6E8 57 A0 0B FC */ rlwinm r0, r29, 1, 0xf, 0x1e -/* 8030C6EC 7C 83 03 2E */ sthx r4, r3, r0 -lbl_8030C6F0: -/* 8030C6F0 3B BD 00 01 */ addi r29, r29, 1 -lbl_8030C6F4: -/* 8030C6F4 57 A3 04 3E */ clrlwi r3, r29, 0x10 -/* 8030C6F8 A0 1E 00 10 */ lhz r0, 0x10(r30) -/* 8030C6FC 7C 03 00 40 */ cmplw r3, r0 -/* 8030C700 41 80 FF AC */ blt lbl_8030C6AC -/* 8030C704 3B A0 00 00 */ li r29, 0 -/* 8030C708 48 00 00 4C */ b lbl_8030C754 -lbl_8030C70C: -/* 8030C70C 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8030C710 7F A4 EB 78 */ mr r4, r29 -/* 8030C714 4B FD 23 E5 */ bl getName__10JUTNameTabCFUs -/* 8030C718 7C 64 1B 78 */ mr r4, r3 -/* 8030C71C 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 8030C720 4B FD 23 39 */ bl getIndex__10JUTNameTabCFPCc -/* 8030C724 2C 03 FF FF */ cmpwi r3, -1 -/* 8030C728 41 82 00 14 */ beq lbl_8030C73C -/* 8030C72C 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 8030C730 57 A0 0B FC */ rlwinm r0, r29, 1, 0xf, 0x1e -/* 8030C734 7C 64 03 2E */ sthx r3, r4, r0 -/* 8030C738 48 00 00 18 */ b lbl_8030C750 -lbl_8030C73C: -/* 8030C73C 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8030C740 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8030C744 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8030C748 57 A0 0B FC */ rlwinm r0, r29, 1, 0xf, 0x1e -/* 8030C74C 7C 83 03 2E */ sthx r4, r3, r0 -lbl_8030C750: -/* 8030C750 3B BD 00 01 */ addi r29, r29, 1 -lbl_8030C754: -/* 8030C754 57 A3 04 3E */ clrlwi r3, r29, 0x10 -/* 8030C758 A0 1E 00 12 */ lhz r0, 0x12(r30) -/* 8030C75C 7C 03 00 40 */ cmplw r3, r0 -/* 8030C760 41 80 FF AC */ blt lbl_8030C70C -lbl_8030C764: -/* 8030C764 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030C768 48 05 5A C1 */ bl _restgpr_29 -/* 8030C76C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8030C770 7C 08 03 A6 */ mtlr r0 -/* 8030C774 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030C778 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen.s b/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen.s deleted file mode 100644 index 058d2beab19..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen.s +++ /dev/null @@ -1,129 +0,0 @@ -lbl_8030BD10: -/* 8030BD10 94 21 FE D0 */ stwu r1, -0x130(r1) -/* 8030BD14 7C 08 02 A6 */ mflr r0 -/* 8030BD18 90 01 01 34 */ stw r0, 0x134(r1) -/* 8030BD1C 39 61 01 30 */ addi r11, r1, 0x130 -/* 8030BD20 48 05 64 B1 */ bl _savegpr_26 -/* 8030BD24 7C 7D 1B 78 */ mr r29, r3 -/* 8030BD28 7C 9E 23 79 */ or. r30, r4, r4 -/* 8030BD2C 41 82 01 A4 */ beq lbl_8030BED0 -/* 8030BD30 80 1E 01 10 */ lwz r0, 0x110(r30) -/* 8030BD34 28 00 00 00 */ cmplwi r0, 0 -/* 8030BD38 41 82 01 98 */ beq lbl_8030BED0 -/* 8030BD3C 80 1E 01 08 */ lwz r0, 0x108(r30) -/* 8030BD40 28 00 00 00 */ cmplwi r0, 0 -/* 8030BD44 41 82 01 8C */ beq lbl_8030BED0 -/* 8030BD48 3B 60 00 00 */ li r27, 0 -/* 8030BD4C 48 00 00 4C */ b lbl_8030BD98 -lbl_8030BD50: -/* 8030BD50 38 7D 00 20 */ addi r3, r29, 0x20 -/* 8030BD54 7F 64 DB 78 */ mr r4, r27 -/* 8030BD58 4B FD 2D A1 */ bl getName__10JUTNameTabCFUs -/* 8030BD5C 7C 64 1B 78 */ mr r4, r3 -/* 8030BD60 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8030BD64 4B FD 2C F5 */ bl getIndex__10JUTNameTabCFPCc -/* 8030BD68 2C 03 FF FF */ cmpwi r3, -1 -/* 8030BD6C 41 82 00 14 */ beq lbl_8030BD80 -/* 8030BD70 80 9D 00 1C */ lwz r4, 0x1c(r29) -/* 8030BD74 57 60 0B FC */ rlwinm r0, r27, 1, 0xf, 0x1e -/* 8030BD78 7C 64 03 2E */ sthx r3, r4, r0 -/* 8030BD7C 48 00 00 18 */ b lbl_8030BD94 -lbl_8030BD80: -/* 8030BD80 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8030BD84 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8030BD88 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 8030BD8C 57 60 0B FC */ rlwinm r0, r27, 1, 0xf, 0x1e -/* 8030BD90 7C 83 03 2E */ sthx r4, r3, r0 -lbl_8030BD94: -/* 8030BD94 3B 7B 00 01 */ addi r27, r27, 1 -lbl_8030BD98: -/* 8030BD98 57 63 04 3E */ clrlwi r3, r27, 0x10 -/* 8030BD9C A0 1D 00 1A */ lhz r0, 0x1a(r29) -/* 8030BDA0 7C 03 00 40 */ cmplw r3, r0 -/* 8030BDA4 41 80 FF AC */ blt lbl_8030BD50 -/* 8030BDA8 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 8030BDAC 3C 80 80 31 */ lis r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha /* 0x8030CB3C@ha */ -/* 8030BDB0 38 84 CB 3C */ addi r4, r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l /* 0x8030CB3C@l */ -/* 8030BDB4 48 05 5E B9 */ bl __destroy_new_array -/* 8030BDB8 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 8030BDBC A3 83 00 00 */ lhz r28, 0(r3) -/* 8030BDC0 57 83 18 38 */ slwi r3, r28, 3 -/* 8030BDC4 38 63 00 10 */ addi r3, r3, 0x10 -/* 8030BDC8 4B FC 2E FD */ bl __nwa__FUl -/* 8030BDCC 3C 80 80 31 */ lis r4, __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha /* 0x8030CB2C@ha */ -/* 8030BDD0 38 84 CB 2C */ addi r4, r4, __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l /* 0x8030CB2C@l */ -/* 8030BDD4 3C A0 80 31 */ lis r5, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha /* 0x8030CB3C@ha */ -/* 8030BDD8 38 A5 CB 3C */ addi r5, r5, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l /* 0x8030CB3C@l */ -/* 8030BDDC 38 C0 00 08 */ li r6, 8 -/* 8030BDE0 7F 87 E3 78 */ mr r7, r28 -/* 8030BDE4 48 05 61 31 */ bl __construct_new_array -/* 8030BDE8 90 7D 00 30 */ stw r3, 0x30(r29) -/* 8030BDEC 80 1D 00 30 */ lwz r0, 0x30(r29) -/* 8030BDF0 28 00 00 00 */ cmplwi r0, 0 -/* 8030BDF4 41 82 00 DC */ beq lbl_8030BED0 -/* 8030BDF8 38 00 00 00 */ li r0, 0 -/* 8030BDFC 98 01 00 08 */ stb r0, 8(r1) -/* 8030BE00 3B E0 00 00 */ li r31, 0 -/* 8030BE04 48 00 00 B8 */ b lbl_8030BEBC -lbl_8030BE08: -/* 8030BE08 7F E4 FB 78 */ mr r4, r31 -/* 8030BE0C 48 00 11 05 */ bl getResReference__15J2DResReferenceCFUs -/* 8030BE10 7C 64 1B 79 */ or. r4, r3, r3 -/* 8030BE14 3B 40 00 00 */ li r26, 0 -/* 8030BE18 41 82 00 48 */ beq lbl_8030BE60 -/* 8030BE1C 38 61 00 08 */ addi r3, r1, 8 -/* 8030BE20 3C A0 54 49 */ lis r5, 0x5449 /* 0x54494D47@ha */ -/* 8030BE24 38 A5 4D 47 */ addi r5, r5, 0x4D47 /* 0x54494D47@l */ -/* 8030BE28 38 C0 00 00 */ li r6, 0 -/* 8030BE2C 4B FD 22 F5 */ bl getResource__15JUTResReferenceFPCvUlP10JKRArchive -/* 8030BE30 7C 7A 1B 79 */ or. r26, r3, r3 -/* 8030BE34 40 82 00 2C */ bne lbl_8030BE60 -/* 8030BE38 83 8D 90 10 */ lwz r28, mDataManage__9J2DScreen(r13) -/* 8030BE3C 28 1C 00 00 */ cmplwi r28, 0 -/* 8030BE40 41 82 00 20 */ beq lbl_8030BE60 -/* 8030BE44 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 8030BE48 7F E4 FB 78 */ mr r4, r31 -/* 8030BE4C 48 00 10 F9 */ bl getName__15J2DResReferenceCFUs -/* 8030BE50 7C 64 1B 78 */ mr r4, r3 -/* 8030BE54 7F 83 E3 78 */ mr r3, r28 -/* 8030BE58 48 00 0F C1 */ bl get__13J2DDataManageFPCc -/* 8030BE5C 7C 7A 1B 78 */ mr r26, r3 -lbl_8030BE60: -/* 8030BE60 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 8030BE64 57 FB 1B 78 */ rlwinm r27, r31, 3, 0xd, 0x1c -/* 8030BE68 7F 43 D9 2E */ stwx r26, r3, r27 -/* 8030BE6C 28 1A 00 00 */ cmplwi r26, 0 -/* 8030BE70 41 82 00 48 */ beq lbl_8030BEB8 -/* 8030BE74 88 1A 00 08 */ lbz r0, 8(r26) -/* 8030BE78 28 00 00 00 */ cmplwi r0, 0 -/* 8030BE7C 41 82 00 3C */ beq lbl_8030BEB8 -/* 8030BE80 38 60 00 18 */ li r3, 0x18 -/* 8030BE84 4B FC 2D C9 */ bl __nw__FUl -/* 8030BE88 7C 7C 1B 79 */ or. r28, r3, r3 -/* 8030BE8C 41 82 00 20 */ beq lbl_8030BEAC -/* 8030BE90 38 80 00 00 */ li r4, 0 -/* 8030BE94 88 BA 00 09 */ lbz r5, 9(r26) -/* 8030BE98 88 DA 00 01 */ lbz r6, 1(r26) -/* 8030BE9C A0 FA 00 0A */ lhz r7, 0xa(r26) -/* 8030BEA0 80 1A 00 0C */ lwz r0, 0xc(r26) -/* 8030BEA4 7D 1A 02 14 */ add r8, r26, r0 -/* 8030BEA8 4B FD 2A 75 */ bl storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv -lbl_8030BEAC: -/* 8030BEAC 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 8030BEB0 38 1B 00 04 */ addi r0, r27, 4 -/* 8030BEB4 7F 83 01 2E */ stwx r28, r3, r0 -lbl_8030BEB8: -/* 8030BEB8 3B FF 00 01 */ addi r31, r31, 1 -lbl_8030BEBC: -/* 8030BEBC 57 E4 04 3E */ clrlwi r4, r31, 0x10 -/* 8030BEC0 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 8030BEC4 A0 03 00 00 */ lhz r0, 0(r3) -/* 8030BEC8 7C 04 00 40 */ cmplw r4, r0 -/* 8030BECC 41 80 FF 3C */ blt lbl_8030BE08 -lbl_8030BED0: -/* 8030BED0 39 61 01 30 */ addi r11, r1, 0x130 -/* 8030BED4 48 05 63 49 */ bl _restgpr_26 -/* 8030BED8 80 01 01 34 */ lwz r0, 0x134(r1) -/* 8030BEDC 7C 08 03 A6 */ mtlr r0 -/* 8030BEE0 38 21 01 30 */ addi r1, r1, 0x130 -/* 8030BEE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen.s b/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen.s deleted file mode 100644 index f7f8260bf99..00000000000 --- a/asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8030BC60: -/* 8030BC60 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8030BC64 7C 08 02 A6 */ mflr r0 -/* 8030BC68 90 01 00 24 */ stw r0, 0x24(r1) -/* 8030BC6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030BC70 48 05 65 6D */ bl _savegpr_29 -/* 8030BC74 7C 7D 1B 78 */ mr r29, r3 -/* 8030BC78 7C 9E 23 79 */ or. r30, r4, r4 -/* 8030BC7C 41 82 00 7C */ beq lbl_8030BCF8 -/* 8030BC80 80 1E 01 10 */ lwz r0, 0x110(r30) -/* 8030BC84 28 00 00 00 */ cmplwi r0, 0 -/* 8030BC88 41 82 00 70 */ beq lbl_8030BCF8 -/* 8030BC8C 3B E0 00 00 */ li r31, 0 -/* 8030BC90 48 00 00 4C */ b lbl_8030BCDC -lbl_8030BC94: -/* 8030BC94 38 7D 00 34 */ addi r3, r29, 0x34 -/* 8030BC98 7F E4 FB 78 */ mr r4, r31 -/* 8030BC9C 4B FD 2E 5D */ bl getName__10JUTNameTabCFUs -/* 8030BCA0 7C 64 1B 78 */ mr r4, r3 -/* 8030BCA4 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8030BCA8 4B FD 2D B1 */ bl getIndex__10JUTNameTabCFPCc -/* 8030BCAC 2C 03 FF FF */ cmpwi r3, -1 -/* 8030BCB0 41 82 00 14 */ beq lbl_8030BCC4 -/* 8030BCB4 80 9D 00 30 */ lwz r4, 0x30(r29) -/* 8030BCB8 57 E0 0B FC */ rlwinm r0, r31, 1, 0xf, 0x1e -/* 8030BCBC 7C 64 03 2E */ sthx r3, r4, r0 -/* 8030BCC0 48 00 00 18 */ b lbl_8030BCD8 -lbl_8030BCC4: -/* 8030BCC4 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 8030BCC8 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8030BCCC 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 8030BCD0 57 E0 0B FC */ rlwinm r0, r31, 1, 0xf, 0x1e -/* 8030BCD4 7C 83 03 2E */ sthx r4, r3, r0 -lbl_8030BCD8: -/* 8030BCD8 3B FF 00 01 */ addi r31, r31, 1 -lbl_8030BCDC: -/* 8030BCDC 57 E4 04 3E */ clrlwi r4, r31, 0x10 -/* 8030BCE0 A0 7D 00 18 */ lhz r3, 0x18(r29) -/* 8030BCE4 38 00 00 03 */ li r0, 3 -/* 8030BCE8 7C 03 03 D6 */ divw r0, r3, r0 -/* 8030BCEC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8030BCF0 7C 04 00 40 */ cmplw r4, r0 -/* 8030BCF4 41 80 FF A0 */ blt lbl_8030BC94 -lbl_8030BCF8: -/* 8030BCF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030BCFC 48 05 65 2D */ bl _restgpr_29 -/* 8030BD00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8030BD04 7C 08 03 A6 */ mtlr r0 -/* 8030BD08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030BD0C 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index e97c5be8c6d..654c997b511 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -1,20 +1,23 @@ #ifndef J2DANIMATION_H #define J2DANIMATION_H +#include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/JUtility/JUTNameTab.h" #include "JSystem/JUtility/JUTTexture.h" #include "dolphin/gx/GX.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" class J2DScreen; class J2DAnmBase { public: - /* 80053C94 */ virtual ~J2DAnmBase(); + /* 80053C94 */ virtual ~J2DAnmBase() {} /* 800569B0 */ virtual void searchUpdateMaterialID(J2DScreen*); s16 getFrameMax() const { return mFrameMax; } void setFrame(f32 frame) { mFrame = frame; } + f32 getFrame() const { return mFrame; } s32 getKind() const { return mKind; } private: @@ -27,7 +30,7 @@ private: class J2DAnmVtxColor : public J2DAnmBase { public: - /* 8030A358 */ virtual ~J2DAnmVtxColor(); + /* 8030A358 */ virtual ~J2DAnmVtxColor() {} /* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const; private: @@ -39,31 +42,54 @@ private: struct J3DTransformInfo; struct J3DTextureSRTInfo; +struct J2DAnmVtxColorKeyInfo { + J3DAnmKeyTableBase mRInfo; + J3DAnmKeyTableBase mGInfo; + J3DAnmKeyTableBase mBInfo; + J3DAnmKeyTableBase mAInfo; +}; // Size = 0x18 + class J2DAnmVtxColorKey : public J2DAnmVtxColor { - /* 8030CC20 */ virtual ~J2DAnmVtxColorKey(); + /* 8030CC20 */ virtual ~J2DAnmVtxColorKey() {} /* 8030B704 */ virtual void getColor(u8, u16, _GXColor*) const; private: - /* 0x24 */ void* field_0x24[2]; - /* 0x2C */ void* field_0x2c; - /* 0x30 */ void* field_0x30; - /* 0x34 */ void* field_0x34; - /* 0x38 */ void* field_0x38; + /* 0x24 */ J2DAnmVtxColorKeyInfo* mInfoTable[2]; + /* 0x2C */ s16* mRValues; + /* 0x30 */ s16* mGValues; + /* 0x34 */ s16* mBValues; + /* 0x38 */ s16* mAValues; }; // Size: 0x3C +struct J2DAnmVtxColorFullInfo { + /* 0x00 */ u16 mRMaxFrame; + /* 0x02 */ u16 mROffset; + /* 0x04 */ u16 mGMaxFrame; + /* 0x06 */ u16 mGOffset; + /* 0x08 */ u16 mBMaxFrame; + /* 0x0A */ u16 mBOffset; + /* 0x0C */ u16 mAMaxFrame; + /* 0x0E */ u16 mAOffset; +}; // Size = 0x10 + class J2DAnmVtxColorFull : public J2DAnmVtxColor { public: - /* 8030CC8C */ virtual ~J2DAnmVtxColorFull(); + /* 8030CC8C */ virtual ~J2DAnmVtxColorFull() {} /* 8030B4C4 */ virtual void getColor(u8, u16, _GXColor*) const; private: - /* 0x24 */ void* field_0x24[2]; - /* 0x2C */ void* field_0x2c; - /* 0x30 */ void* field_0x30; - /* 0x34 */ void* field_0x34; - /* 0x38 */ void* field_0x38; + /* 0x24 */ J2DAnmVtxColorFullInfo* mInfoTable[2]; + /* 0x2C */ u8* mRValues; + /* 0x30 */ u8* mGValues; + /* 0x34 */ u8* mBValues; + /* 0x38 */ u8* mAValues; }; // Size: 0x3C +struct J2DAnmVisibilityFullInfo { + u16 _0; + u16 _2; +}; // Size = 0x4 + class J2DAnmVisibilityFull : public J2DAnmBase { public: /* 8030A3B4 */ virtual ~J2DAnmVisibilityFull(); @@ -72,60 +98,84 @@ public: private: /* 0x10 */ u16 field_0x10; /* 0x12 */ u16 field_0x12; - /* 0x14 */ void* field_0x14; - /* 0x18 */ void* field_0x18; + /* 0x14 */ J2DAnmVisibilityFullInfo* field_0x14; + /* 0x18 */ u8* field_0x18; }; // Size: 0x1C class J2DAnmTransform : public J2DAnmBase { public: - /* 80184370 */ virtual ~J2DAnmTransform(); + /* 80184370 */ virtual ~J2DAnmTransform() {} /* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const; -private: - /* 0x10 */ f32* field_0x10; - /* 0x14 */ s16* field_0x14; - /* 0x18 */ f32* field_0x18; +protected: + /* 0x10 */ f32* mScaleValues; + /* 0x14 */ s16* mRotationValues; + /* 0x18 */ f32* mTranslateValues; }; // Size: 0x1C +struct J2DAnmTransformKeyInfo { + J3DAnmKeyTableBase mScaleInfo; + J3DAnmKeyTableBase mRotationInfo; + J3DAnmKeyTableBase mTranslateInfo; +}; // Size = 0x12 + class J2DAnmTransformKey : public J2DAnmTransform { public: - /* 801959C0 */ virtual ~J2DAnmTransformKey(); - /* 8030CD7C */ virtual void getTransform(u16, J3DTransformInfo*) const; + /* 801959C0 */ virtual ~J2DAnmTransformKey() {} + /* 8030CD7C */ virtual void getTransform(u16 p1, J3DTransformInfo* pInfo) const { + this->calcTransform(getFrame(), p1, pInfo); + } /* 8030AAFC */ virtual void calcTransform(f32, u16, J3DTransformInfo*) const; private: /* 0x1C */ u8 field_0x1c[8]; - /* 0x24 */ void* field_0x24; - /* 0x28 */ void* field_0x28; + /* 0x24 */ u32 field_0x24; + /* 0x28 */ J2DAnmTransformKeyInfo* mInfoTable; }; +struct J2DAnmTransformFullInfo { + /* 0x00 */ u16 mScaleMaxFrame; + /* 0x02 */ u16 mScaleOffset; + /* 0x04 */ u16 mRotationMaxFrame; + /* 0x06 */ u16 mRotationOffset; + /* 0x08 */ u16 mTranslateMaxFrame; + /* 0x0A */ u16 mTranslateOffset; +}; // Size = 0xC + class J2DAnmTransformFull : public J2DAnmTransform { public: - /* 8030CDAC */ virtual ~J2DAnmTransformFull(); + /* 8030CDAC */ virtual ~J2DAnmTransformFull() {} /* 8030A590 */ virtual void getTransform(u16, J3DTransformInfo*) const; private: /* 0x1C */ u8 field_0x1c[6]; /* 0x22 */ u16 field_0x22; - /* 0x24 */ void* field_0x24; + /* 0x24 */ J2DAnmTransformFullInfo* mTableInfo; }; +struct J2DAnmTextureSRTKeyInfo { + J3DAnmKeyTableBase mScaleInfo; + J3DAnmKeyTableBase mRotationInfo; + J3DAnmKeyTableBase mTranslationInfo; +}; // Size = 0x12 + class J2DAnmTextureSRTKey : public J2DAnmBase { public: /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; - /* 80184274 */ virtual ~J2DAnmTextureSRTKey(); + /* 80184274 */ virtual ~J2DAnmTextureSRTKey() {} /* 8030BC60 */ virtual void searchUpdateMaterialID(J2DScreen*); + u16 getUpdateMaterialNum() const { return mUpdateMaterialNum / 3; } private: /* 0x10 */ int field_0x10; - /* 0x14 */ int field_0x14; + /* 0x14 */ J2DAnmTextureSRTKeyInfo* mInfoTable; /* 0x18 */ u16 mUpdateMaterialNum; /* 0x1A */ u16 field_0x1a; /* 0x1C */ u16 field_0x1c; - /* 0x20 */ int field_0x20; - /* 0x24 */ int field_0x24; - /* 0x28 */ int field_0x28; + /* 0x20 */ f32* mScaleValues; + /* 0x24 */ s16* mRotationValues; + /* 0x28 */ f32* mTranslationValues; /* 0x2C */ u8* mUpdateTexMtxID; /* 0x30 */ u16* mUpdateMaterialID; /* 0x34 */ JUTNameTab field_0x34; @@ -144,6 +194,13 @@ private: /* 0x7C */ int field_0x7c; }; +struct J2DAnmTexPatternInfo { + /* 0x00 */ u16 mMaxFrame; + /* 0x02 */ u16 mOffset; + /* 0x04 */ u16 _4; + /* 0x06 */ u16 _6; +}; // Size = 0x8 + class J2DAnmTexPattern : public J2DAnmBase { public: struct J2DAnmTexPatternTIMGPointer { @@ -155,15 +212,16 @@ public: }; // Size: 0x8 /* 8030BEE8 */ void getTexNo(u16, u16*) const; - /* 8030BF9C */ void getResTIMG(u16) const; - /* 8030BFF0 */ void getPalette(u16) const; + /* 8030BF9C */ ResTIMG* getResTIMG(u16) const; + /* 8030BFF0 */ JUTPalette* getPalette(u16) const; - /* 8030CB90 */ virtual ~J2DAnmTexPattern(); + /* 8030CB90 */ virtual ~J2DAnmTexPattern() { delete[] mTIMGPtrArray; } /* 8030BD10 */ virtual void searchUpdateMaterialID(J2DScreen*); + u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; } private: - /* 0x10 */ int field_0x10; - /* 0x14 */ void* mAnmTable; + /* 0x10 */ u16* mValues; + /* 0x14 */ J2DAnmTexPatternInfo* mAnmTable; /* 0x18 */ u8 field_0x18[2]; /* 0x1A */ u16 mUpdateMaterialNum; /* 0x1C */ u16* mUpdaterMaterialID; @@ -171,13 +229,21 @@ private: /* 0x30 */ J2DAnmTexPatternTIMGPointer* mTIMGPtrArray; }; +struct J2DAnmTevRegKeyInfo { + /* 0x00 */ J3DAnmKeyTableBase mRTable; + /* 0x06 */ J3DAnmKeyTableBase mGTable; + /* 0x0C */ J3DAnmKeyTableBase mBTable; + /* 0x12 */ J3DAnmKeyTableBase mATable; + /* 0x18 */ u8 _18[4]; +}; // Size = 0x1C + class J2DAnmTevRegKey : public J2DAnmBase { public: /* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const; /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const; - /* 801841EC */ virtual ~J2DAnmTevRegKey(); - /* 8030C678 */ virtual void searchUpdateMaterialID(J2DScreen*); + /* 801841EC */ virtual ~J2DAnmTevRegKey() {} + /* 8030C678 */ virtual void searchUpdateMaterialID(J2DScreen* pScreen); private: /* 0x10 */ u16 mCRegUpdateMaterialNum; @@ -194,27 +260,28 @@ private: /* 0x28 */ JUTNameTab field_0x28; /* 0x38 */ u16* mKRegUpdateMaterialID; /* 0x3C */ JUTNameTab field_0x3c; - /* 0x4C */ void* mAnmCRegKeyTable; - /* 0x50 */ void* mAnmKRegKeyTable; - /* 0x54 */ int field_0x54; - /* 0x58 */ int field_0x58; - /* 0x5C */ int field_0x5c; - /* 0x60 */ int field_0x60; - /* 0x64 */ int field_0x64; - /* 0x68 */ int field_0x68; - /* 0x6C */ int field_0x6c; - /* 0x70 */ int field_0x70; + /* 0x4C */ J2DAnmTevRegKeyInfo* mAnmCRegKeyTable; + /* 0x50 */ J2DAnmTevRegKeyInfo* mAnmKRegKeyTable; + /* 0x54 */ s16* mCRValues; + /* 0x58 */ s16* mCGValues; + /* 0x5C */ s16* mCBValues; + /* 0x60 */ s16* mCAValues; + /* 0x64 */ s16* mKRValues; + /* 0x68 */ s16* mKGValues; + /* 0x6C */ s16* mKBValues; + /* 0x70 */ s16* mKAValues; }; class J2DAnmColor : public J2DAnmBase { public: - /* 801842FC */ virtual ~J2DAnmColor(); + /* 801842FC */ virtual ~J2DAnmColor() {} /* 8030AF24 */ virtual void searchUpdateMaterialID(J2DScreen*); /* 802EB390 */ virtual void getColor(u16, _GXColor*) const; + u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; } private: /* 0x10 */ u16 field_0x10; - /* 0x10 */ u16 field_0x12; + /* 0x12 */ u16 field_0x12; /* 0x14 */ u16 field_0x14; /* 0x16 */ u16 field_0x16; /* 0x18 */ u16 mUpdateMaterialNum; @@ -222,30 +289,135 @@ private: /* 0x20 */ JUTNameTab field_0x20; }; // Size: 0x30 +struct J2DAnmColorKeyInfo { + J3DAnmKeyTableBase mRInfo; + J3DAnmKeyTableBase mGInfo; + J3DAnmKeyTableBase mBInfo; + J3DAnmKeyTableBase mAInfo; +}; // Size = 0x18 + class J2DAnmColorKey : public J2DAnmColor { public: - /* 80239BE0 */ virtual ~J2DAnmColorKey(); + /* 80239BE0 */ virtual ~J2DAnmColorKey() {} /* 8030B200 */ virtual void getColor(u16, _GXColor*) const; private: - /* 0x30 */ int field_0x30; - /* 0x34 */ int field_0x34; - /* 0x38 */ int field_0x38; - /* 0x3C */ int field_0x3c; - /* 0x40 */ int field_0x40; + /* 0x30 */ s16* mRValues; + /* 0x34 */ s16* mGValues; + /* 0x38 */ s16* mBValues; + /* 0x3C */ s16* mAValues; + /* 0x40 */ J2DAnmColorKeyInfo* mInfoTable; }; +struct J2DAnmColorFullInfo { + /* 0x00 */ u16 mRMaxFrame; + /* 0x02 */ u16 mROffset; + /* 0x04 */ u16 mGMaxFrame; + /* 0x06 */ u16 mGOffset; + /* 0x08 */ u16 mBMaxFrame; + /* 0x0A */ u16 mBOffset; + /* 0x0C */ u16 mAMaxFrame; + /* 0x0E */ u16 mAOffset; +}; // Size = 0x10 + class J2DAnmColorFull : public J2DAnmColor { public: - /* 8030CCF8 */ virtual ~J2DAnmColorFull(); + /* 8030CCF8 */ virtual ~J2DAnmColorFull() {} /* 8030AFC8 */ virtual void getColor(u16, _GXColor*) const; private: - /* 0x30 */ int field_0x30; - /* 0x34 */ int field_0x34; - /* 0x38 */ int field_0x38; - /* 0x3C */ int field_0x3c; - /* 0x40 */ int field_0x40; + /* 0x30 */ u8* mRValues; + /* 0x34 */ u8* mGValues; + /* 0x38 */ u8* mBValues; + /* 0x3C */ u8* mAValues; + /* 0x40 */ J2DAnmColorFullInfo* mInfoTable; }; +template +inline f32 J2DHermiteInterpolation(f32, T*, T*, T*, T*, T*, T*); + +inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f32 p3, + register f32 p4, register f32 p5, register f32 p6, + register f32 p7) { + register f32 ff25; + register f32 ff31; + register f32 ff30; + register f32 ff29; + register f32 ff28; + register f32 ff27; + register f32 ff26; + // clang-format off + asm { + fsubs ff31, p1, p2 + fsubs ff30, p5, p2 + fdivs ff29, ff31, ff30 + fmuls ff28,ff29,ff29 + fadds ff25,ff29,ff29 + fsubs ff27,ff28,ff29 + fsubs ff30, p3, p6 + fmsubs ff26,ff25,ff27,ff28 + fmadds ff25,p4,ff27,p4 + fmadds ff26,ff26,ff30,p3 + fmadds ff25,p7,ff27,ff25 + fmsubs ff25,ff29,p4,ff25 + fnmsubs ff25,ff31,ff25,ff26 + + } + // clang-format on + return ff25; +} + +template <> +inline f32 J2DHermiteInterpolation(f32 f1, f32* f2, f32* f3, f32* f4, f32* f5, f32* f6, + f32* f7) { + return JMAHermiteInterpolation(f1, *f2, *f3, *f4, *f5, *f6, *f7); +} + +template <> +inline f32 J2DHermiteInterpolation(register f32 pp1, register s16* pp2, register s16* pp3, + register s16* pp4, register s16* pp5, register s16* pp6, + register s16* pp7) { + register f32 p1 = pp1; + register f32 ff8; + register f32 ff7; + register f32 ff6; + register f32 ff5; + register f32 ff4; + register f32 ff3; + register f32 ff2; + register f32 ff0; + register f32 fout; + register s16* p2 = pp2; + register s16* p3 = pp3; + register s16* p4 = pp4; + register s16* p5 = pp5; + register s16* p6 = pp6; + register s16* p7 = pp7; + // clang-format off + asm { + psq_l ff2, 0(p2), 0x1, 5 + psq_l ff0, 0(p5), 0x1, 5 + psq_l ff7, 0(p3), 0x1, 5 + fsubs ff5, ff0, ff2 + psq_l ff6, 0(p6), 0x1, 5 + fsubs ff3, p1, ff2 + psq_l ff0, 0(p7), 0x1, 5 + fsubs ff4, ff6, ff7 + fdivs ff3, ff3, ff5 + psq_l fout, 0(p4), 0x1, 5 + fmadds ff0, ff0, ff5, ff7 + fmuls ff2, ff3, ff3 + fnmsubs ff4, ff5, fout, ff4 + fsubs ff0, ff0, ff6 + fsubs ff0, ff0, ff4 + fmuls ff0, ff2, ff0 + fmadds fout, ff5, fout, ff0 + fmadds fout, fout, ff3, ff7 + fmadds fout, ff4, ff2, fout + fsubs fout, fout, ff0 + } + // clang-format on + return fout; +} + #endif /* J2DANIMATION_H */ diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h index 67470e2d839..486f1164c27 100644 --- a/include/JSystem/J2DGraph/J2DScreen.h +++ b/include/JSystem/J2DGraph/J2DScreen.h @@ -53,7 +53,7 @@ public: static J2DDataManage* mDataManage; -private: + // private: /* 0x100 */ bool mScissor; /* 0x102 */ u16 mMaterialNum; /* 0x104 */ J2DMaterial* mMaterials; diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index a745ef473a5..15ded86a066 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -75,7 +75,11 @@ class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull { struct J3DTextureSRTInfo; struct J3DModelData; struct J3DMaterialTable; -struct J3DAnmKeyTableBase {}; +struct J3DAnmKeyTableBase { + /* 0x00 */ u16 mMaxFrame; + /* 0x02 */ u16 mOffset; + /* 0x04 */ u16 mType; +}; // Size = 0x6 class J3DAnmTextureSRTKey : public J3DAnmBase { public: diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h index dd9ab27cf51..f269bed4641 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/include/JSystem/JUtility/JUTPalette.h @@ -14,6 +14,9 @@ struct ResTLUT { class JUTPalette { public: + JUTPalette(_GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) { + this->storeTLUT(p1, p2, p3, p4, p5); + } /* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*); /* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); /* 802DE95C */ bool load(); diff --git a/include/JSystem/JUtility/JUTResource.h b/include/JSystem/JUtility/JUTResource.h index 9f6cdb775ea..3447ca53afc 100644 --- a/include/JSystem/JUtility/JUTResource.h +++ b/include/JSystem/JUtility/JUTResource.h @@ -7,13 +7,13 @@ class JUTResReference { private: - u8 unk_0x0[0x100]; + u8 unk_0x0[0x101]; public: JUTResReference() { unk_0x0[0] = 0; } /* 802DE078 */ void* getResource(JSUInputStream*, u32, JKRArchive*); - /* 802DE120 */ void getResource(void const*, u32, JKRArchive*); - /* 802DE1BC */ void getResource(u32, JKRArchive*); + /* 802DE120 */ void* getResource(void const*, u32, JKRArchive*); + /* 802DE1BC */ void* getResource(u32, JKRArchive*); }; // only rough size known due to getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index b30dbbdf3a5..e0174a9b5af 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -226,6 +226,43 @@ u8* OSGetStackPointer(void); void OSCreateAlarm(OSAlarm*); void OSCancelAlarm(OSAlarm*); void OSSetAlarm(OSAlarm*, OSTime, OSAlarmHandler); + +inline s16 __OSf32tos16(register f32 inF) { + register s16 out; + u32 tmp; + register u32* tmpPtr = &tmp; + // clang-format off + asm { + psq_st inF, 0(tmpPtr), 0x1, 5 + lha out, 0(tmpPtr) + } + // clang-format on + + return out; +} + +inline void OSf32tos16(f32* f, s16* out) { + *out = __OSf32tos16(*f); +} + +inline u8 __OSf32tou8(register f32 inF) { + register u8 out; + u32 tmp; + register u32* tmpPtr = &tmp; + // clang-format off + asm { + psq_st inF, 0(tmpPtr), 0x1, 2 + lbz out, 0(tmpPtr) + } + // clang-format on + + return out; +} + +inline void OSf32tou8(f32* f, u8* out) { + *out = __OSf32tou8(*f); +} + }; // extern "C" void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); @@ -325,22 +362,4 @@ inline void* OSPhysicalToCached(u32 offset) { return (void*)(offset + 0x80000000); } -static inline u8 __OSf32tou8(register f32 src) { - f32 tmp; - register f32* p = &tmp; - register u8 ret; - - asm - { - psq_st src, 0(p), 1, 2 - lbz ret, 0(p) - } - - return ret; -} - -static inline void OSf32tou8(register f32* src, volatile register u8* dst) { - *dst = __OSf32tou8(*src); -} - #endif diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp index ac8f49ae3e3..fcb85ac1b7c 100644 --- a/libs/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp @@ -4,527 +4,914 @@ // #include "JSystem/J2DGraph/J2DAnimation.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J3DGraphBase/J3DTransform.h" +#include "JSystem/JUtility/JUTResource.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JKRArchive {}; - -struct JUTResReference { - /* 802DE120 */ void getResource(void const*, u32, JKRArchive*); -}; - -struct J3DTransformInfo {}; - -struct J3DTextureSRTInfo {}; - -struct J3DAnmKeyTableBase {}; - -struct J2DScreen { - static u8 mDataManage[4 + 4 /* padding */]; -}; - -struct J2DResReference { - /* 8030CF10 */ void getResReference(u16) const; - /* 8030CF44 */ void getName(u16) const; -}; - -struct J2DDataManage { - /* 8030CE18 */ void get(char const*); -}; - -// -// Forward References: -// - -extern "C" void getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo(); -extern "C" void calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo(); -extern "C" void searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen(); -extern "C" void getColor__15J2DAnmColorFullCFUsP8_GXColor(); -extern "C" void getColor__14J2DAnmColorKeyCFUsP8_GXColor(); -extern "C" void getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor(); -extern "C" void getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor(); -extern "C" void calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo(); -extern "C" void searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen(); -extern "C" void searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen(); -extern "C" void getTexNo__16J2DAnmTexPatternCFUsPUs(); -extern "C" void getResTIMG__16J2DAnmTexPatternCFUs(); -extern "C" void getPalette__16J2DAnmTexPatternCFUs(); -extern "C" void getVisibility__20J2DAnmVisibilityFullCFUsPUc(); -extern "C" void getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10(); -extern "C" void getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor(); -extern "C" void searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen(); -extern "C" void func_8030C77C(void* _this, f32, J3DAnmKeyTableBase*, s16*); -extern "C" void func_8030C9B0(void* _this, f32, J3DAnmKeyTableBase*, f32*); -extern "C" void __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv(); -extern "C" void __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv(); -extern "C" void __dt__16J2DAnmTexPatternFv(); -extern "C" void __dt__17J2DAnmVtxColorKeyFv(); -extern "C" void __dt__18J2DAnmVtxColorFullFv(); -extern "C" void __dt__15J2DAnmColorFullFv(); -extern "C" void getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo(); -extern "C" void __dt__19J2DAnmTransformFullFv(); - -// -// External References: -// - -extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen(); -extern "C" void __dt__15J2DAnmTevRegKeyFv(); -extern "C" void __dt__19J2DAnmTextureSRTKeyFv(); -extern "C" void __dt__11J2DAnmColorFv(); -extern "C" void __dt__18J2DAnmTransformKeyFv(); -extern "C" void __dt__14J2DAnmColorKeyFv(); -extern "C" void* __nw__FUl(); -extern "C" void* __nwa__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getResource__15JUTResReferenceFPCvUlP10JKRArchive(); -extern "C" void storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv(); -extern "C" void getIndex__10JUTNameTabCFPCc(); -extern "C" void getName__10JUTNameTabCFUs(); -extern "C" void getColor__11J2DAnmColorCFUsP8_GXColor(); -extern "C" void get__13J2DDataManageFPCc(); -extern "C" void getResReference__15J2DResReferenceCFUs(); -extern "C" void getName__15J2DResReferenceCFUs(); -extern "C" void __destroy_new_array(); -extern "C" void __construct_new_array(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */]; -extern "C" extern void* __vt__10JUTNameTab[3]; -extern "C" extern void* __vt__14J2DAnmVtxColor[5]; -extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */]; +f32 J2DGetKeyFrameInterpolationf(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2); +f32 J2DGetKeyFrameInterpolations(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2); // // Declarations: // -/* ############################################################################################## */ -/* 80456300-80456308 004900 0004+04 10/10 0/0 0/0 .sdata2 @1573 */ -SECTION_SDATA2 static f32 lit_1573[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - -/* 80456308-80456310 004908 0008+00 5/5 0/0 0/0 .sdata2 @1576 */ -SECTION_SDATA2 static f64 lit_1576 = 4503599627370496.0 /* cast u32 to float */; - /* 8030A590-8030AAFC 304ED0 056C+00 1/0 0/0 0/0 .text * getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTransformFull::getTransform(u16 param_0, J3DTransformInfo* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo.s" +void J2DAnmTransformFull::getTransform(u16 param_0, J3DTransformInfo* transformInfo) const { + u16 idx = (param_0 * 3); + J2DAnmTransformFullInfo* xPart = &mTableInfo[idx]; + J2DAnmTransformFullInfo* yPart = &mTableInfo[idx + 1]; + J2DAnmTransformFullInfo* zPart = &mTableInfo[idx + 2]; + u16 xMaxFrame = xPart->mScaleMaxFrame; + if (getFrame() < 0) { + transformInfo->mScale.x = mScaleValues[xPart->mScaleOffset]; + } else if (getFrame() >= xMaxFrame) { + transformInfo->mScale.x = mScaleValues[(xPart->mScaleOffset + (xMaxFrame - 1))]; + } else { + transformInfo->mScale.x = mScaleValues[(xPart->mScaleOffset + (int)getFrame())]; + } + u16 yMaxFrame = yPart->mScaleMaxFrame; + if (getFrame() < 0) { + transformInfo->mScale.y = mScaleValues[yPart->mScaleOffset]; + } else if (getFrame() >= yMaxFrame) { + transformInfo->mScale.y = mScaleValues[(yPart->mScaleOffset + (yMaxFrame - 1))]; + } else { + transformInfo->mScale.y = mScaleValues[(yPart->mScaleOffset + (int)getFrame())]; + } + u16 zMaxFrame = zPart->mScaleMaxFrame; + if (getFrame() < 0) { + transformInfo->mScale.z = mScaleValues[zPart->mScaleOffset]; + } else if (getFrame() >= zMaxFrame) { + transformInfo->mScale.z = mScaleValues[(zPart->mScaleOffset + (zMaxFrame - 1))]; + } else { + transformInfo->mScale.z = mScaleValues[(zPart->mScaleOffset + (int)getFrame())]; + } + xMaxFrame = xPart->mRotationMaxFrame; + if (getFrame() < 0) { + transformInfo->mRotation.x = mRotationValues[xPart->mRotationOffset]; + } else if (getFrame() >= xMaxFrame) { + transformInfo->mRotation.x = mRotationValues[(xPart->mRotationOffset + (xMaxFrame - 1))]; + } else { + transformInfo->mRotation.x = mRotationValues[(xPart->mRotationOffset + (int)getFrame())]; + } + yMaxFrame = yPart->mRotationMaxFrame; + if (getFrame() < 0) { + transformInfo->mRotation.y = mRotationValues[yPart->mRotationOffset]; + } else if (getFrame() >= yMaxFrame) { + transformInfo->mRotation.y = mRotationValues[(yPart->mRotationOffset + (yMaxFrame - 1))]; + } else { + transformInfo->mRotation.y = mRotationValues[(yPart->mRotationOffset + (int)getFrame())]; + } + zMaxFrame = zPart->mRotationMaxFrame; + if (getFrame() < 0) { + transformInfo->mRotation.z = mRotationValues[zPart->mRotationOffset]; + } else if (getFrame() >= zMaxFrame) { + transformInfo->mRotation.z = mRotationValues[(zPart->mRotationOffset + (zMaxFrame - 1))]; + } else { + transformInfo->mRotation.z = mRotationValues[(zPart->mRotationOffset + (int)getFrame())]; + } + xMaxFrame = xPart->mTranslateMaxFrame; + if (getFrame() < 0) { + transformInfo->mTranslate.x = mTranslateValues[xPart->mTranslateOffset]; + } else if (getFrame() >= xMaxFrame) { + transformInfo->mTranslate.x = mTranslateValues[(xPart->mTranslateOffset + (xMaxFrame - 1))]; + } else { + transformInfo->mTranslate.x = mTranslateValues[(xPart->mTranslateOffset + (int)getFrame())]; + } + yMaxFrame = yPart->mTranslateMaxFrame; + if (getFrame() < 0) { + transformInfo->mTranslate.y = mTranslateValues[yPart->mTranslateOffset]; + } else if (getFrame() >= yMaxFrame) { + transformInfo->mTranslate.y = mTranslateValues[(yPart->mTranslateOffset + (yMaxFrame - 1))]; + } else { + transformInfo->mTranslate.y = mTranslateValues[(yPart->mTranslateOffset + (int)getFrame())]; + } + zMaxFrame = zPart->mTranslateMaxFrame; + if (getFrame() < 0) { + transformInfo->mTranslate.z = mTranslateValues[zPart->mTranslateOffset]; + } else if (getFrame() >= zMaxFrame) { + transformInfo->mTranslate.z = mTranslateValues[(zPart->mTranslateOffset + (zMaxFrame - 1))]; + } else { + transformInfo->mTranslate.z = mTranslateValues[(zPart->mTranslateOffset + (int)getFrame())]; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80456310-80456314 004910 0004+00 2/2 0/0 0/0 .sdata2 @1619 */ -SECTION_SDATA2 static f32 lit_1619 = 1.0f; /* 8030AAFC-8030AF24 30543C 0428+00 1/0 0/0 0/0 .text * calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1, - J3DTransformInfo* param_2) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo.s" +void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1, + J3DTransformInfo* transformInfo) const { + u16 idx = param_1 * 3; + J2DAnmTransformKeyInfo* xInf = &mInfoTable[idx]; + J2DAnmTransformKeyInfo* yInf = &mInfoTable[idx + 1]; + J2DAnmTransformKeyInfo* zInf = &mInfoTable[idx + 2]; + switch (xInf->mScaleInfo.mMaxFrame) { + case 0: + transformInfo->mScale.x = 1; + break; + case 1: + transformInfo->mScale.x = mScaleValues[xInf->mScaleInfo.mOffset]; + break; + default: + transformInfo->mScale.x = J2DGetKeyFrameInterpolationf( + param_0, &xInf->mScaleInfo, &mScaleValues[xInf->mScaleInfo.mOffset]); + } + switch (yInf->mScaleInfo.mMaxFrame) { + case 0: + transformInfo->mScale.y = 1; + break; + case 1: + transformInfo->mScale.y = mScaleValues[yInf->mScaleInfo.mOffset]; + break; + default: + transformInfo->mScale.y = J2DGetKeyFrameInterpolationf( + param_0, &yInf->mScaleInfo, &mScaleValues[yInf->mScaleInfo.mOffset]); + } + switch (zInf->mScaleInfo.mMaxFrame) { + case 0: + transformInfo->mScale.z = 1; + break; + case 1: + transformInfo->mScale.z = mScaleValues[zInf->mScaleInfo.mOffset]; + break; + default: + transformInfo->mScale.z = J2DGetKeyFrameInterpolationf( + param_0, &zInf->mScaleInfo, &mScaleValues[zInf->mScaleInfo.mOffset]); + } + switch (xInf->mRotationInfo.mMaxFrame) { + case 0: + transformInfo->mRotation.x = 0; + break; + case 1: + transformInfo->mRotation.x = mRotationValues[xInf->mRotationInfo.mOffset] << field_0x24; + break; + default: + transformInfo->mRotation.x = + static_cast(J2DGetKeyFrameInterpolations( + param_0, &xInf->mRotationInfo, &mRotationValues[xInf->mRotationInfo.mOffset])) + << field_0x24; + } + switch (yInf->mRotationInfo.mMaxFrame) { + case 0: + transformInfo->mRotation.y = 0; + break; + case 1: + transformInfo->mRotation.y = mRotationValues[yInf->mRotationInfo.mOffset] << field_0x24; + break; + default: + transformInfo->mRotation.y = + static_cast(J2DGetKeyFrameInterpolations( + param_0, &yInf->mRotationInfo, &mRotationValues[yInf->mRotationInfo.mOffset])) + << field_0x24; + } + switch (zInf->mRotationInfo.mMaxFrame) { + case 0: + transformInfo->mRotation.z = 0; + break; + case 1: + transformInfo->mRotation.z = mRotationValues[zInf->mRotationInfo.mOffset] << field_0x24; + break; + default: + transformInfo->mRotation.z = + static_cast(J2DGetKeyFrameInterpolations( + param_0, &zInf->mRotationInfo, &mRotationValues[zInf->mRotationInfo.mOffset])) + << field_0x24; + } + switch (xInf->mTranslateInfo.mMaxFrame) { + case 0: + transformInfo->mTranslate.x = 0; + break; + case 1: + transformInfo->mTranslate.x = mTranslateValues[xInf->mTranslateInfo.mOffset]; + break; + default: + transformInfo->mTranslate.x = J2DGetKeyFrameInterpolationf( + param_0, &xInf->mTranslateInfo, &mTranslateValues[xInf->mTranslateInfo.mOffset]); + } + switch (yInf->mTranslateInfo.mMaxFrame) { + case 0: + transformInfo->mTranslate.y = 0; + break; + case 1: + transformInfo->mTranslate.y = mTranslateValues[yInf->mTranslateInfo.mOffset]; + break; + default: + transformInfo->mTranslate.y = J2DGetKeyFrameInterpolationf( + param_0, &yInf->mTranslateInfo, &mTranslateValues[yInf->mTranslateInfo.mOffset]); + } + switch (zInf->mTranslateInfo.mMaxFrame) { + case 0: + transformInfo->mTranslate.z = 0; + break; + case 1: + transformInfo->mTranslate.z = mTranslateValues[zInf->mTranslateInfo.mOffset]; + break; + default: + transformInfo->mTranslate.z = J2DGetKeyFrameInterpolationf( + param_0, &zInf->mTranslateInfo, &mTranslateValues[zInf->mTranslateInfo.mOffset]); + } } -#pragma pop /* 8030AF24-8030AFC8 305864 00A4+00 3/0 0/0 0/0 .text * searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmColor::searchUpdateMaterialID(J2DScreen* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen.s" +void J2DAnmColor::searchUpdateMaterialID(J2DScreen* pScreen) { + if (pScreen != NULL && pScreen->mNameTable != NULL) { + for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) { + s32 idx = pScreen->mNameTable->getIndex(this->field_0x20.getName(entry)); + if (idx != -1) { + mUpdateMaterialID[entry] = idx; + } else { + mUpdateMaterialID[entry] = 0xFFFF; + } + } + } } -#pragma pop /* 8030AFC8-8030B200 305908 0238+00 1/0 0/0 0/0 .text getColor__15J2DAnmColorFullCFUsP8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmColorFull::getColor(u16 param_0, _GXColor* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getColor__15J2DAnmColorFullCFUsP8_GXColor.s" +void J2DAnmColorFull::getColor(u16 param_0, _GXColor* pColor) const { + J2DAnmColorFullInfo* info = &mInfoTable[param_0]; + u16 maxFrame = info->mRMaxFrame; + if (getFrame() < 0) { + pColor->r = mRValues[info->mROffset]; + } else if (getFrame() >= maxFrame) { + pColor->r = mRValues[info->mROffset + (maxFrame - 1)]; + } else { + pColor->r = mRValues[info->mROffset + (int)getFrame()]; + } + maxFrame = info->mGMaxFrame; + if (getFrame() < 0) { + pColor->g = mGValues[info->mGOffset]; + } else if (getFrame() >= maxFrame) { + pColor->g = mGValues[info->mGOffset + (maxFrame - 1)]; + } else { + pColor->g = mGValues[info->mGOffset + (int)getFrame()]; + } + maxFrame = info->mBMaxFrame; + if (getFrame() < 0) { + pColor->b = mBValues[info->mBOffset]; + } else if (getFrame() >= maxFrame) { + pColor->b = mBValues[info->mBOffset + (maxFrame - 1)]; + } else { + pColor->b = mBValues[info->mBOffset + (int)getFrame()]; + } + maxFrame = info->mAMaxFrame; + if (getFrame() < 0) { + pColor->a = mAValues[info->mAOffset]; + } else if (getFrame() >= maxFrame) { + pColor->a = mAValues[info->mAOffset + (maxFrame - 1)]; + } else { + pColor->a = mAValues[info->mAOffset + (int)getFrame()]; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80456314-80456318 004914 0004+00 3/3 0/0 0/0 .sdata2 @1748 */ -SECTION_SDATA2 static f32 lit_1748 = 255.0f; /* 8030B200-8030B4C4 305B40 02C4+00 1/0 0/0 0/0 .text getColor__14J2DAnmColorKeyCFUsP8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmColorKey::getColor(u16 param_0, _GXColor* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getColor__14J2DAnmColorKeyCFUsP8_GXColor.s" +void J2DAnmColorKey::getColor(u16 param_0, _GXColor* pColor) const { + J2DAnmColorKeyInfo* info = &mInfoTable[param_0]; + f32 val; + switch (info->mRInfo.mMaxFrame) { + case 0: + pColor->r = 0; + break; + case 1: + pColor->r = mRValues[info->mRInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mRInfo, + &mRValues[info->mRInfo.mOffset]); + if (val < 0) { + pColor->r = 0; + } else if (val > 255) { + pColor->r = 255; + } else { + OSf32tou8(&val, &pColor->r); + } + } + switch (info->mGInfo.mMaxFrame) { + case 0: + pColor->g = 0; + break; + case 1: + pColor->g = mGValues[info->mGInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mGInfo, + &mGValues[info->mGInfo.mOffset]); + if (val < 0) { + pColor->g = 0; + } else if (val > 255) { + pColor->g = 255; + } else { + OSf32tou8(&val, &pColor->g); + } + } + switch (info->mBInfo.mMaxFrame) { + case 0: + pColor->b = 0; + break; + case 1: + pColor->b = mBValues[info->mBInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mBInfo, + &mBValues[info->mBInfo.mOffset]); + if (val < 0) { + pColor->b = 0; + } else if (val > 255) { + pColor->b = 255; + } else { + OSf32tou8(&val, &pColor->b); + } + } + switch (info->mAInfo.mMaxFrame) { + case 0: + pColor->a = 0; + break; + case 1: + pColor->a = mAValues[info->mAInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mAInfo, + &mAValues[info->mAInfo.mOffset]); + if (val < 0) { + pColor->a = 0; + } else if (val > 255) { + pColor->a = 255; + } else { + OSf32tou8(&val, &pColor->a); + } + } } -#pragma pop /* 8030B4C4-8030B704 305E04 0240+00 1/0 0/0 0/0 .text * getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* param_2) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor.s" +void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const { + J2DAnmVtxColorFullInfo* info = &mInfoTable[param_0][param_1]; + u16 maxFrame = info->mRMaxFrame; + if (getFrame() < 0) { + pColor->r = mRValues[info->mROffset]; + } else if (getFrame() >= maxFrame) { + pColor->r = mRValues[info->mROffset + (maxFrame - 1)]; + } else { + pColor->r = mRValues[info->mROffset + (int)getFrame()]; + } + maxFrame = info->mGMaxFrame; + if (getFrame() < 0) { + pColor->g = mGValues[info->mGOffset]; + } else if (getFrame() >= maxFrame) { + pColor->g = mGValues[info->mGOffset + (maxFrame - 1)]; + } else { + pColor->g = mGValues[info->mGOffset + (int)getFrame()]; + } + maxFrame = info->mBMaxFrame; + if (getFrame() < 0) { + pColor->b = mBValues[info->mBOffset]; + } else if (getFrame() >= maxFrame) { + pColor->b = mBValues[info->mBOffset + (maxFrame - 1)]; + } else { + pColor->b = mBValues[info->mBOffset + (int)getFrame()]; + } + maxFrame = info->mAMaxFrame; + if (getFrame() < 0) { + pColor->a = mAValues[info->mAOffset]; + } else if (getFrame() >= maxFrame) { + pColor->a = mAValues[info->mAOffset + (maxFrame - 1)]; + } else { + pColor->a = mAValues[info->mAOffset + (int)getFrame()]; + } } -#pragma pop /* 8030B704-8030B9F0 306044 02EC+00 1/0 0/0 0/0 .text * getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, _GXColor* param_2) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor.s" +void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const { + J2DAnmVtxColorKeyInfo* info = &mInfoTable[param_0][param_1]; + f32 val; + switch (info->mRInfo.mMaxFrame) { + case 0: + pColor->r = 0; + break; + case 1: + pColor->r = mRValues[info->mRInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mRInfo, + &mRValues[info->mRInfo.mOffset]); + if ((val <= 0)) { + pColor->r = 0; + } else if (val <= 255) { + OSf32tou8(&val, &pColor->r); + } else { + pColor->r = 255; + } + } + switch (info->mGInfo.mMaxFrame) { + case 0: + pColor->g = 0; + break; + case 1: + pColor->g = mGValues[info->mGInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mGInfo, + &mGValues[info->mGInfo.mOffset]); + if (val <= 0) { + pColor->g = 0; + } else if (val <= 255) { + OSf32tou8(&val, &pColor->g); + } else { + pColor->g = 255; + } + } + switch (info->mBInfo.mMaxFrame) { + case 0: + pColor->b = 0; + break; + case 1: + pColor->b = mBValues[info->mBInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mBInfo, + &mBValues[info->mBInfo.mOffset]); + if (val <= 0) { + pColor->b = 0; + } else if (val <= 255) { + OSf32tou8(&val, &pColor->b); + } else { + pColor->b = 255; + } + } + switch (info->mAInfo.mMaxFrame) { + case 0: + pColor->a = 0; + break; + case 1: + pColor->a = mAValues[info->mAInfo.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mAInfo, + &mAValues[info->mAInfo.mOffset]); + if (val <= 0) { + pColor->a = 0; + } else if (val <= 255) { + OSf32tou8(&val, &pColor->a); + } else { + pColor->a = 255; + } + } } -#pragma pop /* 8030B9F0-8030BC60 306330 0270+00 0/0 1/1 0/0 .text * calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, - J3DTextureSRTInfo* param_2) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo.s" +void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTInfo* pInfo) const { + u16 idx = param_1 * 3; + J2DAnmTextureSRTKeyInfo* xInf = &mInfoTable[idx]; + J2DAnmTextureSRTKeyInfo* yInf = &mInfoTable[idx + 1]; + J2DAnmTextureSRTKeyInfo* zInf = &mInfoTable[idx + 2]; + switch (xInf->mScaleInfo.mMaxFrame) { + case 0: + pInfo->mScaleX = 1; + break; + case 1: + pInfo->mScaleX = mScaleValues[xInf->mScaleInfo.mOffset]; + break; + default: + pInfo->mScaleX = J2DGetKeyFrameInterpolationf(param_0, &xInf->mScaleInfo, + &mScaleValues[xInf->mScaleInfo.mOffset]); + } + switch (yInf->mScaleInfo.mMaxFrame) { + case 0: + pInfo->mScaleY = 1; + break; + case 1: + pInfo->mScaleY = mScaleValues[yInf->mScaleInfo.mOffset]; + break; + default: + pInfo->mScaleY = J2DGetKeyFrameInterpolationf(param_0, &yInf->mScaleInfo, + &mScaleValues[yInf->mScaleInfo.mOffset]); + } + switch (zInf->mRotationInfo.mMaxFrame) { + case 0: + pInfo->mRotation = 0; + break; + case 1: + pInfo->mRotation = mRotationValues[zInf->mRotationInfo.mOffset] << field_0x10; + break; + default: + pInfo->mRotation = + static_cast(J2DGetKeyFrameInterpolations( + param_0, &zInf->mRotationInfo, &mRotationValues[zInf->mRotationInfo.mOffset])) + << field_0x10; + } + switch (xInf->mTranslationInfo.mMaxFrame) { + case 0: + pInfo->mTranslationX = 0; + break; + case 1: + pInfo->mTranslationX = mTranslationValues[xInf->mTranslationInfo.mOffset]; + break; + default: + pInfo->mTranslationX = J2DGetKeyFrameInterpolationf( + param_0, &xInf->mTranslationInfo, &mTranslationValues[xInf->mTranslationInfo.mOffset]); + } + switch (yInf->mTranslationInfo.mMaxFrame) { + case 0: + pInfo->mTranslationY = 0; + break; + case 1: + pInfo->mTranslationY = mTranslationValues[yInf->mTranslationInfo.mOffset]; + break; + default: + pInfo->mTranslationY = J2DGetKeyFrameInterpolationf( + param_0, &yInf->mTranslationInfo, &mTranslationValues[yInf->mTranslationInfo.mOffset]); + } } -#pragma pop /* 8030BC60-8030BD10 3065A0 00B0+00 1/0 0/0 0/0 .text * searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTextureSRTKey::searchUpdateMaterialID(J2DScreen* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen.s" +void J2DAnmTextureSRTKey::searchUpdateMaterialID(J2DScreen* pScreen) { + if (pScreen != NULL && pScreen->mNameTable != NULL) { + for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) { + s32 idx = pScreen->mNameTable->getIndex(field_0x34.getName(entry)); + if (idx != -1) { + mUpdateMaterialID[entry] = idx; + } else { + mUpdateMaterialID[entry] = 0xFFFF; + } + } + } } -#pragma pop /* 8030BD10-8030BEE8 306650 01D8+00 1/0 0/0 0/0 .text * searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen.s" +void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) { + if (pScreen != NULL && pScreen->mNameTable != NULL && pScreen->field_0x108 != NULL) { + for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) { + s32 idx = pScreen->mNameTable->getIndex(field_0x20.getName(entry)); + if (idx != -1) { + mUpdaterMaterialID[entry] = idx; + } else { + mUpdaterMaterialID[entry] = 0xFFFF; + } + } + delete[] mTIMGPtrArray; + mTIMGPtrArray = new J2DAnmTexPatternTIMGPointer[pScreen->field_0x108->mCount]; + if (mTIMGPtrArray != NULL) { + JUTResReference resRef; + for (u16 i = 0; i < pScreen->field_0x108->mCount; i++) { + s8* var1 = pScreen->field_0x108->getResReference(i); + ResTIMG* var2 = NULL; + if (var1 != NULL) { + var2 = (ResTIMG*)resRef.getResource(var1, 'TIMG', NULL); + if (var2 == NULL && J2DScreen::getDataManage() != NULL) { + var2 = (ResTIMG*)J2DScreen::getDataManage()->get( + pScreen->field_0x108->getName(i)); + } + } + mTIMGPtrArray[i].mRes = var2; + if (var2 != NULL && var2->palettesEnabled) { + JUTPalette* palette = + new JUTPalette(GX_TLUT0, (_GXTlutFmt)var2->paletteFormat, + (JUTTransparency)var2->alphaEnabled, var2->paletteCount, + ((u8*)var2) + var2->paletteOffset); + mTIMGPtrArray[i].mPalette = palette; + } + } + } + } } -#pragma pop /* 8030BEE8-8030BF9C 306828 00B4+00 2/2 1/1 0/0 .text getTexNo__16J2DAnmTexPatternCFUsPUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTexPattern::getTexNo(u16 param_0, u16* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getTexNo__16J2DAnmTexPatternCFUsPUs.s" +void J2DAnmTexPattern::getTexNo(u16 param_0, u16* pTexNo) const { + u16 maxFrame = mAnmTable[param_0].mMaxFrame; + f32 frame = getFrame(); + if (frame < 0) { + *pTexNo = mValues[mAnmTable[param_0].mOffset]; + } else if (frame >= maxFrame) { + *pTexNo = mValues[mAnmTable[param_0].mOffset + (maxFrame - 1)]; + } else { + *pTexNo = mValues[mAnmTable[param_0].mOffset + (int)frame]; + } } -#pragma pop /* 8030BF9C-8030BFF0 3068DC 0054+00 0/0 1/1 0/0 .text getResTIMG__16J2DAnmTexPatternCFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTexPattern::getResTIMG(u16 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getResTIMG__16J2DAnmTexPatternCFUs.s" +ResTIMG* J2DAnmTexPattern::getResTIMG(u16 param_0) const { + if (mTIMGPtrArray == NULL) { + return NULL; + } else { + u16 texNo; + this->getTexNo(param_0, &texNo); + return mTIMGPtrArray[texNo].mRes; + } } -#pragma pop /* 8030BFF0-8030C048 306930 0058+00 0/0 1/1 0/0 .text getPalette__16J2DAnmTexPatternCFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTexPattern::getPalette(u16 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getPalette__16J2DAnmTexPatternCFUs.s" +JUTPalette* J2DAnmTexPattern::getPalette(u16 param_0) const { + if (mTIMGPtrArray == NULL) { + return NULL; + } else { + u16 texNo; + this->getTexNo(param_0, &texNo); + return mTIMGPtrArray[texNo].mPalette; + } } -#pragma pop /* 8030C048-8030C0F0 306988 00A8+00 0/0 3/3 0/0 .text getVisibility__20J2DAnmVisibilityFullCFUsPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmVisibilityFull::getVisibility(u16 param_0, u8* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getVisibility__20J2DAnmVisibilityFullCFUsPUc.s" +void J2DAnmVisibilityFull::getVisibility(u16 param_0, u8* pOut) const { + u16 maxFrame = field_0x14[param_0]._0; + if (getFrame() < 0) { + *pOut = field_0x18[field_0x14[param_0]._2]; + } else if (getFrame() >= maxFrame) { + *pOut = field_0x18[field_0x14[param_0]._2 + (maxFrame - 1)]; + } else { + int frame = getFrame(); + *pOut = field_0x18[field_0x14[param_0]._2 + frame]; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80456318-8045631C 004918 0004+00 1/1 0/0 0/0 .sdata2 @2110 */ -SECTION_SDATA2 static f32 lit_2110 = -1024.0f; - -/* 8045631C-80456320 00491C 0004+00 1/1 0/0 0/0 .sdata2 @2111 */ -SECTION_SDATA2 static f32 lit_2111 = 1023.0f; /* 8030C0F0-8030C3B4 306A30 02C4+00 0/0 1/1 0/0 .text * getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTevRegKey::getTevColorReg(u16 param_0, _GXColorS10* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10.s" +void J2DAnmTevRegKey::getTevColorReg(u16 param_0, _GXColorS10* pColor) const { + J2DAnmTevRegKeyInfo* info = &mAnmCRegKeyTable[param_0]; + f32 val; + switch (info->mRTable.mMaxFrame) { + case 0: + pColor->r = 0; + break; + case 1: + pColor->r = mCRValues[info->mRTable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mRTable, + &mCRValues[info->mRTable.mOffset]); + if (val < -0x400) { + pColor->r = -0x400; + } else if (val > 0x3FF) { + pColor->r = 0x3FF; + } else { + OSf32tos16(&val, &pColor->r); + } + } + switch (info->mGTable.mMaxFrame) { + case 0: + pColor->g = 0; + break; + case 1: + pColor->g = mCGValues[info->mGTable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mGTable, + &mCGValues[info->mGTable.mOffset]); + if (val < -0x400) { + pColor->g = -0x400; + } else if (val > 0x3FF) { + pColor->g = 0x3FF; + } else { + OSf32tos16(&val, &pColor->g); + } + } + switch (info->mBTable.mMaxFrame) { + case 0: + pColor->b = 0; + break; + case 1: + pColor->b = mCBValues[info->mBTable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mBTable, + &mCBValues[info->mBTable.mOffset]); + if (val < -0x400) { + pColor->b = -0x400; + } else if (val > 0x3FF) { + pColor->b = 0x3FF; + } else { + OSf32tos16(&val, &pColor->b); + } + } + switch (info->mATable.mMaxFrame) { + case 0: + pColor->a = 0; + break; + case 1: + pColor->a = mCAValues[info->mATable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mATable, + &mCAValues[info->mATable.mOffset]); + if (val < -0x400) { + pColor->a = -0x400; + } else if (val > 0x3FF) { + pColor->a = 0x3FF; + } else { + OSf32tos16(&val, &pColor->a); + } + } } -#pragma pop /* 8030C3B4-8030C678 306CF4 02C4+00 0/0 1/1 0/0 .text * getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, _GXColor* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor.s" +void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, _GXColor* pColor) const { + J2DAnmTevRegKeyInfo* info = &mAnmKRegKeyTable[param_0]; + f32 val; + switch (info->mRTable.mMaxFrame) { + case 0: + pColor->r = 0; + break; + case 1: + pColor->r = mKRValues[info->mRTable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mRTable, + &mKRValues[info->mRTable.mOffset]); + if (val < 0) { + pColor->r = 0; + } else if (val > 255) { + pColor->r = 255; + } else { + OSf32tou8(&val, &pColor->r); + } + } + switch (info->mGTable.mMaxFrame) { + case 0: + pColor->g = 0; + break; + case 1: + pColor->g = mKGValues[info->mGTable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mGTable, + &mKGValues[info->mGTable.mOffset]); + if (val < 0) { + pColor->g = 0; + } else if (val > 255) { + pColor->g = 255; + } else { + OSf32tou8(&val, &pColor->g); + } + } + switch (info->mBTable.mMaxFrame) { + case 0: + pColor->b = 0; + break; + case 1: + pColor->b = mKBValues[info->mBTable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mBTable, + &mKBValues[info->mBTable.mOffset]); + if (val < 0) { + pColor->b = 0; + } else if (val > 255) { + pColor->b = 255; + } else { + OSf32tou8(&val, &pColor->b); + } + } + switch (info->mATable.mMaxFrame) { + case 0: + pColor->a = 0; + break; + case 1: + pColor->a = mKAValues[info->mATable.mOffset]; + break; + default: + val = J2DGetKeyFrameInterpolations(getFrame(), &info->mATable, + &mKAValues[info->mATable.mOffset]); + if (val < 0) { + pColor->a = 0; + } else if (val > 255) { + pColor->a = 255; + } else { + OSf32tou8(&val, &pColor->a); + } + } } -#pragma pop /* 8030C678-8030C77C 306FB8 0104+00 1/0 0/0 0/0 .text * searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTevRegKey::searchUpdateMaterialID(J2DScreen* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen.s" +void J2DAnmTevRegKey::searchUpdateMaterialID(J2DScreen* pScreen) { + if (pScreen != NULL && pScreen->mNameTable != NULL) { + for (u16 i = 0; i < mCRegUpdateMaterialNum; i++) { + s32 idx = pScreen->mNameTable->getIndex(field_0x28.getName(i)); + if (idx != -1) { + mCRegUpdateMaterialID[i] = idx; + } else { + mCRegUpdateMaterialID[i] = 0xFFFF; + } + } + for (u16 i = 0; i < mKRegUpdateMaterialNum; i++) { + s32 idx = pScreen->mNameTable->getIndex(field_0x3c.getName(i)); + if (idx != -1) { + mKRegUpdateMaterialID[i] = idx; + } else { + mKRegUpdateMaterialID[i] = 0xFFFF; + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80456320-80456328 004920 0008+00 1/1 0/0 0/0 .sdata2 @2379 */ -SECTION_SDATA2 static f64 lit_2379 = 4503601774854144.0 /* cast s32 to float */; /* 8030C77C-8030C9B0 3070BC 0234+00 6/6 0/0 0/0 .text * J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8030C77C(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1, - s16* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/func_8030C77C.s" +// should be J2DGetKeyFrameInterpolation +f32 J2DGetKeyFrameInterpolations(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2) { + if (param_0 < param_2[0]) { + return param_2[1]; + } else { + if (param_1->mType == 0) { + if (param_2[(param_1->mMaxFrame - 1) * 3] <= param_0) { + return param_2[(param_1->mMaxFrame - 1) * 3 + 1]; + } else { + u32 tmp = param_1->mMaxFrame; + while (tmp > 1) { + u32 halfTmp = tmp / 2; + u32 upIdx = halfTmp * 3; + if (param_0 >= param_2[upIdx]) { + param_2 = param_2 + upIdx; + tmp -= halfTmp; + } else { + tmp = halfTmp; + } + } + return J2DHermiteInterpolation(param_0, ¶m_2[0], ¶m_2[1], ¶m_2[2], + ¶m_2[3], ¶m_2[4], ¶m_2[5]); + } + } else { + if (param_2[(param_1->mMaxFrame - 1) * 4] <= param_0) { + return param_2[(param_1->mMaxFrame - 1) * 4 + 1]; + } else { + u32 tmp = param_1->mMaxFrame; + while (tmp > 1) { + u32 halfTmp = tmp / 2; + u32 upIdx = halfTmp * 4; + if (param_0 >= param_2[upIdx]) { + param_2 = param_2 + upIdx; + tmp -= halfTmp; + } else { + tmp = halfTmp; + } + } + return J2DHermiteInterpolation(param_0, ¶m_2[0], ¶m_2[1], ¶m_2[3], + ¶m_2[4], ¶m_2[5], ¶m_2[6]); + } + } + } } -#pragma pop /* 8030C9B0-8030CB2C 3072F0 017C+00 2/2 0/0 0/0 .text * J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8030C9B0(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1, - f32* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/func_8030C9B0.s" +// should be J2DGetKeyFrameInterpolation +f32 J2DGetKeyFrameInterpolationf(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2) { + if (param_0 < param_2[0]) { + return param_2[1]; + } else { + if (param_1->mType == 0) { + if (param_2[(param_1->mMaxFrame - 1) * 3] <= param_0) { + return param_2[(param_1->mMaxFrame - 1) * 3 + 1]; + } else { + u32 tmp = param_1->mMaxFrame; + while (tmp > 1) { + u32 halfTmp = tmp / 2; + u32 upIdx = halfTmp * 3; + if (param_0 >= param_2[upIdx]) { + param_2 = param_2 + upIdx; + tmp -= halfTmp; + } else { + tmp = halfTmp; + } + } + return J2DHermiteInterpolation(param_0, ¶m_2[0], ¶m_2[1], ¶m_2[2], + ¶m_2[3], ¶m_2[4], ¶m_2[5]); + } + } else { + if (param_2[(param_1->mMaxFrame - 1) * 4] <= param_0) { + return param_2[(param_1->mMaxFrame - 1) * 4 + 1]; + } else { + u32 tmp = param_1->mMaxFrame; + while (tmp > 1) { + u32 halfTmp = tmp / 2; + u32 upIdx = halfTmp * 4; + if (param_0 >= param_2[upIdx]) { + param_2 = param_2 + upIdx; + tmp -= halfTmp; + } else { + tmp = halfTmp; + } + } + return J2DHermiteInterpolation(param_0, ¶m_2[0], ¶m_2[1], ¶m_2[3], + ¶m_2[4], ¶m_2[5], ¶m_2[6]); + } + } + } } -#pragma pop -/* 8030CB2C-8030CB3C 30746C 0010+00 1/1 0/0 0/0 .text - * __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DAnmTexPattern::J2DAnmTexPatternTIMGPointer::J2DAnmTexPatternTIMGPointer() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/__ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s" +J2DAnmTexPattern::J2DAnmTexPatternTIMGPointer::J2DAnmTexPatternTIMGPointer() { + mRes = NULL; + mPalette = NULL; } -#pragma pop -/* 8030CB3C-8030CB90 30747C 0054+00 2/2 0/0 0/0 .text - * __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DAnmTexPattern::J2DAnmTexPatternTIMGPointer::~J2DAnmTexPatternTIMGPointer() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/__dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv.s" +J2DAnmTexPattern::J2DAnmTexPatternTIMGPointer::~J2DAnmTexPatternTIMGPointer() { + delete mPalette; } -#pragma pop - -/* ############################################################################################## */ -/* 803CD728-803CD738 02A848 0010+00 0/0 2/2 0/0 .data __vt__15J2DAnmTevRegKey */ -SECTION_DATA extern void* __vt__15J2DAnmTevRegKey[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15J2DAnmTevRegKeyFv, - (void*)searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen, -}; - -/* 803CD738-803CD748 02A858 0010+00 1/1 1/1 0/0 .data __vt__16J2DAnmTexPattern */ -SECTION_DATA extern void* __vt__16J2DAnmTexPattern[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16J2DAnmTexPatternFv, - (void*)searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen, -}; - -/* 8030CB90-8030CC20 3074D0 0090+00 1/0 0/0 0/0 .text __dt__16J2DAnmTexPatternFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__16J2DAnmTexPatternFv() { - // asm J2DAnmTexPattern::~J2DAnmTexPattern() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/__dt__16J2DAnmTexPatternFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803CD748-803CD758 02A868 0010+00 0/0 2/2 0/0 .data __vt__19J2DAnmTextureSRTKey */ -SECTION_DATA extern void* __vt__19J2DAnmTextureSRTKey[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19J2DAnmTextureSRTKeyFv, - (void*)searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen, -}; - -/* 803CD758-803CD76C 02A878 0014+00 1/1 1/1 0/0 .data __vt__17J2DAnmVtxColorKey */ -SECTION_DATA extern void* __vt__17J2DAnmVtxColorKey[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17J2DAnmVtxColorKeyFv, - (void*)searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen, - (void*)getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor, -}; - -/* 8030CC20-8030CC8C 307560 006C+00 1/0 0/0 0/0 .text __dt__17J2DAnmVtxColorKeyFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__17J2DAnmVtxColorKeyFv() { - // asm J2DAnmVtxColorKey::~J2DAnmVtxColorKey() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/__dt__17J2DAnmVtxColorKeyFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803CD76C-803CD780 02A88C 0014+00 1/1 1/1 0/0 .data __vt__18J2DAnmVtxColorFull */ -SECTION_DATA extern void* __vt__18J2DAnmVtxColorFull[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18J2DAnmVtxColorFullFv, - (void*)searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen, - (void*)getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor, -}; - -/* 8030CC8C-8030CCF8 3075CC 006C+00 1/0 0/0 0/0 .text __dt__18J2DAnmVtxColorFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__18J2DAnmVtxColorFullFv() { - // asm J2DAnmVtxColorFull::~J2DAnmVtxColorFull() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/__dt__18J2DAnmVtxColorFullFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803CD780-803CD794 02A8A0 0014+00 0/0 2/2 0/0 .data __vt__14J2DAnmColorKey */ -SECTION_DATA extern void* __vt__14J2DAnmColorKey[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14J2DAnmColorKeyFv, - (void*)searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen, - (void*)getColor__14J2DAnmColorKeyCFUsP8_GXColor, -}; - -/* 803CD794-803CD7A8 02A8B4 0014+00 1/1 1/1 0/0 .data __vt__15J2DAnmColorFull */ -SECTION_DATA extern void* __vt__15J2DAnmColorFull[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15J2DAnmColorFullFv, - (void*)searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen, - (void*)getColor__15J2DAnmColorFullCFUsP8_GXColor, -}; - -/* 803CD7A8-803CD7BC 02A8C8 0014+00 1/1 3/3 0/0 .data __vt__11J2DAnmColor */ -SECTION_DATA extern void* __vt__11J2DAnmColor[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11J2DAnmColorFv, - (void*)searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen, - (void*)getColor__11J2DAnmColorCFUsP8_GXColor, -}; - -/* 8030CCF8-8030CD7C 307638 0084+00 1/0 0/0 0/0 .text __dt__15J2DAnmColorFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__15J2DAnmColorFullFv() { - // asm J2DAnmColorFull::~J2DAnmColorFull() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/__dt__15J2DAnmColorFullFv.s" -} -#pragma pop - -/* 8030CD7C-8030CDAC 3076BC 0030+00 1/0 0/0 0/0 .text - * getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DAnmTransformKey::getTransform(u16 param_0, J3DTransformInfo* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803CD7BC-803CD7D4 02A8DC 0018+00 0/0 2/2 0/0 .data __vt__18J2DAnmTransformKey */ -SECTION_DATA extern void* __vt__18J2DAnmTransformKey[6] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18J2DAnmTransformKeyFv, - (void*)searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen, - (void*)getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo, - (void*)calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo, -}; - -/* 803CD7D4-803CD7E8 02A8F4 0014+00 1/1 1/1 0/0 .data __vt__19J2DAnmTransformFull */ -SECTION_DATA extern void* __vt__19J2DAnmTransformFull[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19J2DAnmTransformFullFv, - (void*)searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen, - (void*)getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo, -}; - -/* 8030CDAC-8030CE18 3076EC 006C+00 1/0 0/0 0/0 .text __dt__19J2DAnmTransformFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__19J2DAnmTransformFullFv() { - // asm J2DAnmTransformFull::~J2DAnmTransformFull() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DAnimation/__dt__19J2DAnmTransformFullFv.s" -} -#pragma pop diff --git a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp index 1463e95602e..33fff4e5ff8 100644 --- a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp +++ b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp @@ -501,7 +501,8 @@ asm void J2DAnmFullLoader_v15::setAnmVtxColor(J2DAnmVtxColorFull* param_0, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DAnmVtxColor::~J2DAnmVtxColor() { +// asm J2DAnmVtxColor::~J2DAnmVtxColor() { +extern "C" asm void __dt__14J2DAnmVtxColorFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/__dt__14J2DAnmVtxColorFv.s" } @@ -511,7 +512,8 @@ asm J2DAnmVtxColor::~J2DAnmVtxColor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DAnmVisibilityFull::~J2DAnmVisibilityFull() { +// asm J2DAnmVisibilityFull::~J2DAnmVisibilityFull() { +extern "C" asm void __dt__20J2DAnmVisibilityFullFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/__dt__20J2DAnmVisibilityFullFv.s" } @@ -521,7 +523,8 @@ asm J2DAnmVisibilityFull::~J2DAnmVisibilityFull() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DAnmLoader::~J2DAnmLoader() { +// asm J2DAnmLoader::~J2DAnmLoader() { +extern "C" asm void __dt__12J2DAnmLoaderFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/__dt__12J2DAnmLoaderFv.s" } diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index f56fe44bbb3..528b355a907 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -7,12 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct J3DTextureSRTInfo {}; - // // Forward References: // diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp index 48a58da6481..62404cbcec5 100644 --- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp +++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp @@ -767,6 +767,7 @@ asm void J2DWindowEx::setAnimation(J2DAnmBase* param_0) { /* 8030363C-80303640 2FDF7C 0004+00 0/0 1/0 0/0 .text getColor__14J2DAnmVtxColorCFUcUsP8_GXColor */ -void J2DAnmVtxColor::getColor(u8 param_0, u16 param_1, _GXColor* param_2) const { +// void J2DAnmVtxColor::getColor(u8 param_0, u16 param_1, _GXColor* param_2) const { +extern "C" void getColor__14J2DAnmVtxColorCFUcUsP8_GXColor() { /* empty function */ } diff --git a/libs/JSystem/JStudio/JStudio/fvb-data.cpp b/libs/JSystem/JStudio/JStudio/fvb-data.cpp index 0b49d483220..c9f65f94e93 100644 --- a/libs/JSystem/JStudio/JStudio/fvb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb-data.cpp @@ -1,35 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: fvb-data -// - -#include "JSystem/JStudio/JStudio/fvb-data.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -// -// Forward References: -// - -extern "C" f32 ga4cSignature__Q37JStudio3fvb4data[1 + 1 /* padding */]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80455450-80455458 003A50 0004+04 0/0 1/1 0/0 .sdata2 ga4cSignature__Q37JStudio3fvb4data - */ -SECTION_SDATA2 f32 JStudio::fvb::data::ga4cSignature[1 + 1 /* padding */] = { - 13712.5f, - /* padding */ - 0.0f, -}; +namespace JStudio { +namespace fvb { +namespace data { +extern const char ga4cSignature[] = "FVB"; +} // namespace data +} // namespace fvb +} // namespace JStudio diff --git a/libs/JSystem/JStudio/JStudio/jstudio-data.cpp b/libs/JSystem/JStudio/JStudio/jstudio-data.cpp index a4aaef29c25..efe27e89810 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-data.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-data.cpp @@ -1,39 +1,5 @@ -// -// Generated By: dol2asm -// Translation Unit: jstudio-data -// - -#include "JSystem/JStudio/JStudio/jstudio-data.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - namespace JStudio { -struct data { - static u8 ga8cSignature[8]; -}; - -}; // namespace JStudio - -// -// Forward References: -// - -extern "C" u8 ga8cSignature__Q27JStudio4data[8]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80455460-80455468 003A60 0008+00 0/0 1/1 0/0 .sdata2 ga8cSignature__Q27JStudio4data */ -SECTION_SDATA2 u8 JStudio::data::ga8cSignature[8] = { - 0x6A, 0x73, 0x74, 0x75, 0x64, 0x69, 0x6F, 0x00, -}; +namespace data { +extern const char ga8cSignature[] = "jstudio"; +} // namespace data +} // namespace JStudio diff --git a/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp b/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp index bef8ceabdb9..eb5d1c45423 100644 --- a/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp @@ -95,4 +95,4 @@ asm void TParse_TParagraph_data::getData(TParse_TParagraph_data::TData* param_0) } // namespace data } // namespace stb -} // namespace JStudio \ No newline at end of file +} // namespace JStudio diff --git a/libs/JSystem/JStudio/JStudio/stb-data.cpp b/libs/JSystem/JStudio/JStudio/stb-data.cpp index 79a90607216..8ea69d95d8d 100644 --- a/libs/JSystem/JStudio/JStudio/stb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/stb-data.cpp @@ -1,23 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: stb-data -// - -#include "JSystem/JStudio/JStudio/stb-data.h" -#include "dol2asm.h" #include "dolphin/types.h" - namespace JStudio { namespace stb { namespace data { - -const u8 gauDataSize_TEParagraph_data[32] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, -}; - -const u32 ga4cSignature = 'STB\0'; - +extern const s32 gauDataSize_TEParagraph_data[8] = {0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40}; +extern const char ga4cSignature[] = "STB"; } // namespace data } // namespace stb } // namespace JStudio diff --git a/libs/JSystem/JSupport/JSUList.cpp b/libs/JSystem/JSupport/JSUList.cpp index 7111ffd9b9a..2577679b30b 100644 --- a/libs/JSystem/JSupport/JSUList.cpp +++ b/libs/JSystem/JSupport/JSUList.cpp @@ -161,4 +161,4 @@ JSUPtrLink* JSUPtrList::getNthLink(u32 index) const { } return node; -} \ No newline at end of file +} diff --git a/libs/JSystem/JUtility/JUTResource.cpp b/libs/JSystem/JUtility/JUTResource.cpp index 646fc83d5ff..8748ee49c63 100644 --- a/libs/JSystem/JUtility/JUTResource.cpp +++ b/libs/JSystem/JUtility/JUTResource.cpp @@ -54,7 +54,7 @@ asm void* JUTResReference::getResource(JSUInputStream* param_0, u32 param_1, JKR #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResReference::getResource(void const* param_0, u32 param_1, JKRArchive* param_2) { +asm void* JUTResReference::getResource(void const* param_0, u32 param_1, JKRArchive* param_2) { nofralloc #include "asm/JSystem/JUtility/JUTResource/getResource__15JUTResReferenceFPCvUlP10JKRArchive.s" } @@ -65,7 +65,7 @@ asm void JUTResReference::getResource(void const* param_0, u32 param_1, JKRArchi #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResReference::getResource(u32 param_0, JKRArchive* param_1) { +asm void* JUTResReference::getResource(u32 param_0, JKRArchive* param_1) { nofralloc #include "asm/JSystem/JUtility/JUTResource/getResource__15JUTResReferenceFUlP10JKRArchive.s" } diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 2c9bf524749..0f237dffefd 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -772,4 +772,4 @@ void cCcD_ObjCo::SetIGrp(u32 grp) { void cCcD_ObjCo::SetVsGrp(u32 grp) { mSPrm &= ~0x70; mSPrm |= grp; -} \ No newline at end of file +} diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 29b49913b42..e3e1ffb72c3 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -3098,7 +3098,8 @@ s32 dDlst_shadowRealPoly_c::getTriMax() { /* 800569B0-800569B4 0512F0 0004+00 1/0 7/0 0/0 .text * searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen */ -void J2DAnmBase::searchUpdateMaterialID(J2DScreen* param_0) { +// void J2DAnmBase::searchUpdateMaterialID(J2DScreen* param_0) { +extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen() { /* empty function */ } diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 9cf71a65d83..9bed0c48145 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -40,8 +40,6 @@ struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); }; -struct cXyz {}; - struct cMl { /* 80263228 */ void memalignB(int, u32); }; diff --git a/tools/clang-format-all.sh b/tools/clang-format-all.sh deleted file mode 100755 index 000a3b605af..00000000000 --- a/tools/clang-format-all.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -if [[ -z "${CLANG_FORMAT_EXE}" ]]; then - CF="clang-format-10" -else - CF="${CLANG_FORMAT_EXE}" -fi - -echo "formatting src/*" -find ./src -iname "*.h" -o -iname "*.cpp" | xargs $CF -i -echo "formatting libs/*" -find ./libs -iname "*.h" -o -iname "*.cpp" | xargs $CF -i -echo "formatting include/*" -find ./include -iname "*.h" -o -iname "*.cpp" | xargs $CF -i -echo "done" diff --git a/tools/clang-format-check.sh b/tools/clang-format-check.sh deleted file mode 100755 index e6279d268d3..00000000000 --- a/tools/clang-format-check.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -clangFormatTargets=$(find . -type f -regex '.*\.\(cpp\|hpp\|h\|cc\|cxx\)') - -for inputFile in $clangFormatTargets -do - clang-format-10 --dry-run --Werror -style=file $inputFile - if [ $? != 0 ] ; then - exit 1 - fi -done diff --git a/tools/tp.py b/tools/tp.py index bc94d11ea2d..ff70a71a413 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -741,51 +741,6 @@ def remove_unused_asm(check): return len(unused_files) -# -# Format -# -@tp.command(name="format") -@click.option("--debug/--no-debug") -@click.option( - "--thread-count", - "-j", - "thread_count", - help="This option is passed forward to all 'make' commands.", - default=4, -) -@click.option( - "--game-path", - type=PathPath(file_okay=False, dir_okay=True), - default=DEFAULT_GAME_PATH, - required=True, -) -@click.option( - "--build-path", - type=PathPath(file_okay=False, dir_okay=True), - default=DEFAULT_BUILD_PATH, - required=True, -) -def format(debug, thread_count, game_path, build_path): - """Format all .cpp/.h files using clang-format""" - - if debug: - LOG.setLevel(logging.DEBUG) - - text = Text("--- Clang-Format") - text.stylize("bold magenta") - CONSOLE.print(text) - - if clang_format(thread_count): - text = Text(" OK") - text.stylize("bold green") - CONSOLE.print(text) - else: - text = Text(" ERR") - text.stylize("bold red") - CONSOLE.print(text) - sys.exit(1) - - # # Pull-Request # @@ -833,21 +788,6 @@ def pull_request(debug, rels, thread_count, game_path, build_path): remove_unused_asm(False) - # - text = Text("--- Clang-Format") - text.stylize("bold magenta") - CONSOLE.print(text) - - if clang_format(thread_count): - text = Text(" OK") - text.stylize("bold green") - CONSOLE.print(text) - else: - text = Text(" ERR") - text.stylize("bold red") - CONSOLE.print(text) - sys.exit(1) - # text = Text("--- Full Rebuild") text.stylize("bold magenta") @@ -1045,41 +985,6 @@ def find_used_asm_files(non_matching, use_progress_bar=True): return includes -def clang_format_impl(file): - cmd = ["clang-format-10", "-i", str(file)] - cf = subprocess.run(args=cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - - -def clang_format(thread_count): - - cpp_files = find_all_cpp_files() - h_files = find_all_header_files() - files = cpp_files | h_files - - with mp.Pool(processes=2 * thread_count) as pool: - result = pool.map_async(clang_format_impl, files) - jobs_left = len(files) - with Progress( - console=CONSOLE, transient=True, refresh_per_second=5 - ) as progress: - task = progress.add_task(f"clang-formating...", total=len(files)) - - while result._number_left > 0: - left = result._number_left * result._chunksize - change = jobs_left - left - jobs_left = left - progress.update( - task, - description=f"clang-formating... ({left} left)", - advance=change, - ) - time.sleep(1 / 5) - - progress.update(task, advance=jobs_left) - - return True - - def rebuild(thread_count, include_rels): LOG.debug("make clean") with Progress(console=CONSOLE, transient=True, refresh_per_second=5) as progress: