make more TUs compile

1 files changed, 8 insertions, 28 deletions

diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
index f790b3ac..9eeb74d4 100644
--- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/J3DGraphLoader/J3DShapeFactory.h"
-#include "dolphin/types.h"
+#include "dolphin/gx/GXAttr.h"
 
 /* 802FE3A8-802FE458       .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */
 J3DShapeFactory::J3DShapeFactory(const J3DShapeBlock&) {
@@ -12,56 +12,36 @@ J3DShapeFactory::J3DShapeFactory(const J3DShapeBlock&) {
 }
 
 /* 802FE458-802FE614       .text create__15J3DShapeFactoryFiUlP14_GXVtxDescList */
-void J3DShapeFactory::create(int, unsigned long, _GXVtxDescList*) {
+J3DShape* J3DShapeFactory::create(int, u32, GXVtxDescList*) {
     /* Nonmatching */
 }
 
 /* 802FE614-802FEA40       .text newShapeMtx__15J3DShapeFactoryCFUlii */
-void J3DShapeFactory::newShapeMtx(unsigned long, int, int) const {
+J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32, int, int) const {
     /* Nonmatching */
 }
 
 /* 802FEA40-802FEACC       .text newShapeDraw__15J3DShapeFactoryCFii */
-void J3DShapeFactory::newShapeDraw(int, int) const {
+J3DShapeDraw* J3DShapeFactory::newShapeDraw(int, int) const {
     /* Nonmatching */
 }
 
 /* 802FEACC-802FEB38       .text allocVcdVatCmdBuffer__15J3DShapeFactoryFUl */
-void J3DShapeFactory::allocVcdVatCmdBuffer(unsigned long) {
+void J3DShapeFactory::allocVcdVatCmdBuffer(u32) {
     /* Nonmatching */
 }
 
 /* 802FEB38-802FEBCC       .text calcSize__15J3DShapeFactoryFiUl */
-void J3DShapeFactory::calcSize(int, unsigned long) {
+s32 J3DShapeFactory::calcSize(int, u32) {
     /* Nonmatching */
 }
 
 /* 802FEBCC-802FEBDC       .text calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl */
-void J3DShapeFactory::calcSizeVcdVatCmdBuffer(unsigned long) {
+s32 J3DShapeFactory::calcSizeVcdVatCmdBuffer(u32) {
     /* Nonmatching */
 }
 
 /* 802FEBDC-802FED40       .text calcSizeShapeMtx__15J3DShapeFactoryCFUlii */
-void J3DShapeFactory::calcSizeShapeMtx(unsigned long, int, int) const {
-    /* Nonmatching */
-}
-
-/* 802FED40-802FED58       .text JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl */
-void JSUConvertOffsetToPtr<J3DShapeDrawInitData>(const void*, unsigned long) {
-    /* Nonmatching */
-}
-
-/* 802FED58-802FED70       .text JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl */
-void JSUConvertOffsetToPtr<J3DShapeMtxInitData>(const void*, unsigned long) {
-    /* Nonmatching */
-}
-
-/* 802FED70-802FED88       .text JSUConvertOffsetToPtr<Uc>__FPCvUl */
-void JSUConvertOffsetToPtr<unsigned char>(const void*, unsigned long) {
-    /* Nonmatching */
-}
-
-/* 802FED88-802FEDA0       .text JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl */
-void JSUConvertOffsetToPtr<_GXVtxDescList>(const void*, unsigned long) {
+s32 J3DShapeFactory::calcSizeShapeMtx(u32, int, int) const {
     /* Nonmatching */
 }