diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s deleted file mode 100644 index acb3cf6f629..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_803127B0: -/* 803127B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803127B4 7C 08 02 A6 */ mflr r0 -/* 803127B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803127BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803127C0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 803127C4 41 82 00 30 */ beq lbl_803127F4 -/* 803127C8 3C 60 80 3D */ lis r3, __vt__13J3DDrawPacket@ha /* 0x803CD968@ha */ -/* 803127CC 38 03 D9 68 */ addi r0, r3, __vt__13J3DDrawPacket@l /* 0x803CD968@l */ -/* 803127D0 90 1F 00 00 */ stw r0, 0(r31) -/* 803127D4 41 82 00 10 */ beq lbl_803127E4 -/* 803127D8 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */ -/* 803127DC 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */ -/* 803127E0 90 1F 00 00 */ stw r0, 0(r31) -lbl_803127E4: -/* 803127E4 7C 80 07 35 */ extsh. r0, r4 -/* 803127E8 40 81 00 0C */ ble lbl_803127F4 -/* 803127EC 7F E3 FB 78 */ mr r3, r31 -/* 803127F0 4B FB C5 4D */ bl __dl__FPv -lbl_803127F4: -/* 803127F4 7F E3 FB 78 */ mr r3, r31 -/* 803127F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803127FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80312800 7C 08 03 A6 */ mtlr r0 -/* 80312804 38 21 00 10 */ addi r1, r1, 0x10 -/* 80312808 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/newDisplayList__13J3DDrawPacketFUl.s b/asm/JSystem/J3DGraphBase/J3DPacket/newDisplayList__13J3DDrawPacketFUl.s deleted file mode 100644 index d7a6ca69e12..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DPacket/newDisplayList__13J3DDrawPacketFUl.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8031280C: -/* 8031280C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80312810 7C 08 02 A6 */ mflr r0 -/* 80312814 90 01 00 14 */ stw r0, 0x14(r1) -/* 80312818 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031281C 93 C1 00 08 */ stw r30, 8(r1) -/* 80312820 7C 7E 1B 78 */ mr r30, r3 -/* 80312824 7C 9F 23 78 */ mr r31, r4 -/* 80312828 38 60 00 10 */ li r3, 0x10 -/* 8031282C 4B FB C4 21 */ bl __nw__FUl -/* 80312830 28 03 00 00 */ cmplwi r3, 0 -/* 80312834 41 82 00 18 */ beq lbl_8031284C -/* 80312838 38 00 00 00 */ li r0, 0 -/* 8031283C 90 03 00 00 */ stw r0, 0(r3) -/* 80312840 90 03 00 04 */ stw r0, 4(r3) -/* 80312844 90 03 00 08 */ stw r0, 8(r3) -/* 80312848 90 03 00 0C */ stw r0, 0xc(r3) -lbl_8031284C: -/* 8031284C 90 7E 00 20 */ stw r3, 0x20(r30) -/* 80312850 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80312854 28 03 00 00 */ cmplwi r3, 0 -/* 80312858 40 82 00 0C */ bne lbl_80312864 -/* 8031285C 38 60 00 04 */ li r3, 4 -/* 80312860 48 00 00 20 */ b lbl_80312880 -lbl_80312864: -/* 80312864 7F E4 FB 78 */ mr r4, r31 -/* 80312868 4B FF FC 21 */ bl newDisplayList__17J3DDisplayListObjFUl -/* 8031286C 2C 03 00 00 */ cmpwi r3, 0 -/* 80312870 38 00 00 00 */ li r0, 0 -/* 80312874 41 82 00 08 */ beq lbl_8031287C -/* 80312878 7C 60 1B 78 */ mr r0, r3 -lbl_8031287C: -/* 8031287C 7C 03 03 78 */ mr r3, r0 -lbl_80312880: -/* 80312880 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80312884 83 C1 00 08 */ lwz r30, 8(r1) -/* 80312888 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031288C 7C 08 03 A6 */ mtlr r0 -/* 80312890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80312894 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/newSingleDisplayList__13J3DDrawPacketFUl.s b/asm/JSystem/J3DGraphBase/J3DPacket/newSingleDisplayList__13J3DDrawPacketFUl.s deleted file mode 100644 index 36bc7f3c04b..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DPacket/newSingleDisplayList__13J3DDrawPacketFUl.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80312898: -/* 80312898 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031289C 7C 08 02 A6 */ mflr r0 -/* 803128A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 803128A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803128A8 93 C1 00 08 */ stw r30, 8(r1) -/* 803128AC 7C 7E 1B 78 */ mr r30, r3 -/* 803128B0 7C 9F 23 78 */ mr r31, r4 -/* 803128B4 38 60 00 10 */ li r3, 0x10 -/* 803128B8 4B FB C3 95 */ bl __nw__FUl -/* 803128BC 28 03 00 00 */ cmplwi r3, 0 -/* 803128C0 41 82 00 18 */ beq lbl_803128D8 -/* 803128C4 38 00 00 00 */ li r0, 0 -/* 803128C8 90 03 00 00 */ stw r0, 0(r3) -/* 803128CC 90 03 00 04 */ stw r0, 4(r3) -/* 803128D0 90 03 00 08 */ stw r0, 8(r3) -/* 803128D4 90 03 00 0C */ stw r0, 0xc(r3) -lbl_803128D8: -/* 803128D8 90 7E 00 20 */ stw r3, 0x20(r30) -/* 803128DC 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 803128E0 28 03 00 00 */ cmplwi r3, 0 -/* 803128E4 40 82 00 0C */ bne lbl_803128F0 -/* 803128E8 38 60 00 04 */ li r3, 4 -/* 803128EC 48 00 00 20 */ b lbl_8031290C -lbl_803128F0: -/* 803128F0 7F E4 FB 78 */ mr r4, r31 -/* 803128F4 4B FF FC 15 */ bl newSingleDisplayList__17J3DDisplayListObjFUl -/* 803128F8 2C 03 00 00 */ cmpwi r3, 0 -/* 803128FC 38 00 00 00 */ li r0, 0 -/* 80312900 41 82 00 08 */ beq lbl_80312908 -/* 80312904 7C 60 1B 78 */ mr r0, r3 -lbl_80312908: -/* 80312908 7C 03 03 78 */ mr r3, r0 -lbl_8031290C: -/* 8031290C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80312910 83 C1 00 08 */ lwz r30, 8(r1) -/* 80312914 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80312918 7C 08 03 A6 */ mtlr r0 -/* 8031291C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80312920 4E 80 00 20 */ blr diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index aa53fac2f30..b829cb202e9 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -247,61 +247,37 @@ J3DDrawPacket::J3DDrawPacket() { } /* 803127B0-8031280C 30D0F0 005C+00 3/2 0/0 0/0 .text __dt__13J3DDrawPacketFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DDrawPacket::~J3DDrawPacket() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s" +J3DDrawPacket::~J3DDrawPacket() { } -#pragma pop /* 8031280C-80312898 30D14C 008C+00 1/1 1/1 0/0 .text newDisplayList__13J3DDrawPacketFUl */ -#ifdef NONMATCHING -J3DError J3DDrawPacket::newDisplayList(u32 param_0) { +J3DError J3DDrawPacket::newDisplayList(u32 size) { mpDisplayListObj = new J3DDisplayListObj(); - if (mpDisplayListObj == NULL) { + if (mpDisplayListObj == NULL) return kJ3DError_Alloc; - } else if (mpDisplayListObj->newDisplayList(param_0)) { - return kJ3DError_Success; - } - return 0; + + J3DError ret = mpDisplayListObj->newDisplayList(size); + if (ret != kJ3DError_Success) + return ret; + + return kJ3DError_Success; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DError J3DDrawPacket::newDisplayList(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/newDisplayList__13J3DDrawPacketFUl.s" -} -#pragma pop -#endif /* 80312898-80312924 30D1D8 008C+00 0/0 1/1 0/0 .text newSingleDisplayList__13J3DDrawPacketFUl */ -#ifdef NONMATCHING -J3DError J3DDrawPacket::newSingleDisplayList(u32 param_0) { +J3DError J3DDrawPacket::newSingleDisplayList(u32 size) { mpDisplayListObj = new J3DDisplayListObj(); - if (mpDisplayListObj == NULL) { + if (mpDisplayListObj == NULL) return kJ3DError_Alloc; - } else if (mpDisplayListObj->newSingleDisplayList(param_0)) { - return kJ3DError_Success; - } - return 0; + + J3DError ret = mpDisplayListObj->newSingleDisplayList(size); + if (ret != kJ3DError_Success) + return ret; + + return kJ3DError_Success; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DError J3DDrawPacket::newSingleDisplayList(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/newSingleDisplayList__13J3DDrawPacketFUl.s" -} -#pragma pop -#endif void J3DDrawPacket::draw() { mpDisplayListObj->callDL();