more simple J2D/J3D funcs (#166)

* more simple J2D/J3D funcs

* JPABaseShape constructor

* fmt

Co-authored-by: lepelog <25211966+lepelog@users.noreply.github.com>

1 files changed, 7 insertions, 33 deletions

diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index 564f9c6e2f..da1f624a6c 100644
--- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "dol2asm.h"
+#include "dolphin/gx/gx.h"
 #include "dolphin/types.h"
 
 //
@@ -25,7 +26,6 @@ SECTION_INIT void memcpy();
 extern "C" void* __nwa__FUli();
 extern "C" void __dl__FPv();
 extern "C" void DCStoreRange();
-extern "C" void GXCallDisplayList();
 extern "C" void _savegpr_18();
 extern "C" void _restgpr_18();
 
@@ -53,42 +53,16 @@ asm void J3DShapeDraw::addTexMtxIndexInDL(u32 param_0, u32 param_1, u32 param_2)
 }
 #pragma pop
 
-/* ############################################################################################## */
-/* 803CDC68-803CDC78 02AD88 000C+04 2/2 0/0 0/0 .data            __vt__12J3DShapeDraw */
-SECTION_DATA extern void* __vt__12J3DShapeDraw[3 + 1 /* padding */] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__12J3DShapeDrawFv,
-    /* padding */
-    NULL,
-};
-
 /* 80314ABC-80314AD4 30F3FC 0018+00 0/0 1/1 0/0 .text            __ct__12J3DShapeDrawFPCUcUl */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm J3DShapeDraw::J3DShapeDraw(u8 const* param_0, u32 param_1) {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DShapeDraw/__ct__12J3DShapeDrawFPCUcUl.s"
+J3DShapeDraw::J3DShapeDraw(u8 const* displayList, u32 displayListSize) {
+    mDisplayList = (void*)displayList;
+    mDisplayListSize = displayListSize;
 }
-#pragma pop
 
 /* 80314AD4-80314B00 30F414 002C+00 0/0 3/3 0/0 .text            draw__12J3DShapeDrawCFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DShapeDraw::draw() const {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DShapeDraw/draw__12J3DShapeDrawCFv.s"
+void J3DShapeDraw::draw() const {
+    GXCallDisplayList(mDisplayList, mDisplayListSize);
 }
-#pragma pop
 
 /* 80314B00-80314B48 30F440 0048+00 1/0 0/0 0/0 .text            __dt__12J3DShapeDrawFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm J3DShapeDraw::~J3DShapeDraw() {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DShapeDraw/__dt__12J3DShapeDrawFv.s"
-}
-#pragma pop
+J3DShapeDraw::~J3DShapeDraw() {}