J2D structs + print / fix GX + MSL string headers (#157)

* J2D structs + print / fix GX + MSL string headers

* remove msl_c/string.h

1 files changed, 2 insertions, 223 deletions

diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
index cdfa7e34fa..62123db41a 100644
--- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -8,211 +8,6 @@
 #include "dolphin/types.h"
 
 //
-// Types:
-//
-
-struct _GXTlut {};
-
-struct _GXTexMapID {};
-
-struct _GXCullMode {};
-
-struct ResTLUT {};
-
-struct ResTIMG {};
-
-struct ResFONT {};
-
-struct JUtility {
-    struct TColor {};
-};
-
-struct JUTPalette {};
-
-struct JUTTexture {
-    /* 802DE2A8 */ void storeTIMG(ResTIMG const*, u8);
-    /* 802DE480 */ void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut);
-};
-
-struct JSUStreamSeekFrom {};
-
-struct JSURandomInputStream {
-    /* 802DC458 */ void peek(void*, s32);
-    /* 802DC4DC */ void seek(s32, JSUStreamSeekFrom);
-};
-
-struct JSUInputStream {
-    /* 802DC298 */ void read(void*, s32);
-};
-
-struct JGeometry {
-    template <typename A1>
-    struct TBox2 {};
-    /* TBox2<f32> */
-    struct TBox2__template0 {};
-
-    template <typename A1>
-    struct TVec2 {};
-    /* TVec2<s16> */
-    struct TVec2__template0 {
-        /* 802FF204 */ void func_802FF204(void* _this);
-    };
-};
-
-struct J2DTexMtx {};
-
-struct J2DTexGenBlock {
-    /* 802EB6A4 */ void setTexMtx(u32, J2DTexMtx&);
-};
-
-struct J2DTevStage {};
-
-struct J2DScreen {
-    /* 802F9640 */ void getNameResource(char const*);
-};
-
-struct J2DAnmTexPattern {};
-
-struct J2DAnmVisibilityFull {
-    /* 8030C048 */ void getVisibility(u16, u8*) const;
-};
-
-struct J2DAnmBase {};
-
-struct J2DAnmTevRegKey {};
-
-struct J2DAnmTextureSRTKey {};
-
-struct J2DAnmVtxColor {};
-
-struct J2DAnmTransform {};
-
-struct J2DPane {
-    /* 80053BC0 */ void calcMtx();
-    /* 80053C00 */ void makeMatrix(f32, f32);
-    /* 802F7540 */ void makeMatrix(f32, f32, f32, f32);
-    /* 802F6F60 */ void move(f32, f32);
-    /* 802F6FB4 */ void add(f32, f32);
-    /* 802F6FF8 */ void resize(f32, f32);
-    /* 802F72E0 */ void search(u64);
-    /* 802F7388 */ void searchUserInfo(u64);
-    /* 802F7430 */ void isUsed(ResTIMG const*);
-    /* 802F74B8 */ void isUsed(ResFONT const*);
-    /* 802F7680 */ void setCullBack(_GXCullMode);
-    /* 802F7B18 */ void makePaneExStream(J2DPane*, JSURandomInputStream*);
-    /* 802F7EF4 */ void setAnimation(J2DAnmBase*);
-    /* 802F8004 */ void clearAnmTransform();
-    /* 802F8080 */ void animationTransform(J2DAnmTransform const*);
-    /* 802F8118 */ void setVisibileAnimation(J2DAnmVisibilityFull*);
-    /* 802F81A0 */ void setVtxColorAnimation(J2DAnmVtxColor*);
-    /* 802F8228 */ void animationPane(J2DAnmTransform const*);
-    /* 802F83D0 */ void setAnimationVF(J2DAnmVisibilityFull*);
-    /* 802F83FC */ void setAnimationVC(J2DAnmVtxColor*);
-    /* 802F8464 */ void setConnectParent(bool);
-    /* 802F8474 */ void update();
-};
-
-struct J2DAnmColor {};
-
-struct J2DMaterial {
-    /* 802EA38C */ void setGX();
-    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
-    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
-    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802EA89C */ void setAnimation(J2DAnmColor*);
-};
-
-struct J2DPictureEx {
-    struct stage_enum {};
-
-    /* 80256034 */ void getMaterial() const;
-    /* 80306B1C */ void setAnimation(J2DAnmTexPattern*);
-    /* 80306AC4 */ void setAnimation(J2DAnmColor*);
-    /* 803071C4 */ void setAnimation(J2DAnmBase*);
-    /* 80306B48 */ void setAnimation(J2DAnmTevRegKey*);
-    /* 80306B7C */ void setAnimation(J2DAnmVtxColor*);
-    /* 80256064 */ void setAnimation(J2DAnmTransform*);
-    /* 80306AF0 */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 80306B74 */ void setAnimation(J2DAnmVisibilityFull*);
-    /* 80303640 */ void initiate(ResTIMG const*, ResTLUT const*);
-    /* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
-    /* 8030393C */ ~J2DPictureEx();
-    /* 803039CC */ void prepareTexture(u8);
-    /* 80303AB4 */ void drawSelf(f32, f32, f32 (*)[3][4]);
-    /* 80303B80 */ void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
-    /* 80303BDC */ void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16, s16,
-                                     f32 (*)[3][4]);
-    /* 80306F04 */ void append(char const*, f32);
-    /* 80303EA4 */ void append(char const*, JUTPalette*, f32);
-    /* 80306ED4 */ void append(ResTIMG const*, f32);
-    /* 80303E5C */ void append(ResTIMG const*, JUTPalette*, f32);
-    /* 80303EEC */ void append(JUTTexture*, f32);
-    /* 80307024 */ void insert(char const*, u8, f32);
-    /* 80303F34 */ void insert(ResTIMG const*, JUTPalette*, u8, f32);
-    /* 80304048 */ void insert(JUTTexture*, u8, f32);
-    /* 80303FD8 */ void insert(char const*, JUTPalette*, u8, f32);
-    /* 80307058 */ void insert(ResTIMG const*, u8, f32);
-    /* 803040E4 */ void insertCommon(u8, f32);
-    /* 8030437C */ void isInsert(u8) const;
-    /* 80304608 */ void remove();
-    /* 8030446C */ void remove(u8);
-    /* 8030466C */ void remove(JUTTexture*);
-    /* 80304728 */ void isRemove(u8) const;
-    /* 8030708C */ void draw(f32, f32, bool, bool, bool);
-    /* 80304890 */ void draw(f32, f32, f32, f32, bool, bool, bool);
-    /* 8030477C */ void draw(f32, f32, u8, bool, bool, bool);
-    /* 80304D88 */ void drawOut(f32, f32, f32, f32, f32, f32);
-    /* 803070D0 */ void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
-    /* 80304EF0 */ void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    /* 80307134 */ void load(u8);
-    /* 80305264 */ void load(_GXTexMapID, u8);
-    /* 803052AC */ void setTevOrder(u8, u8, bool);
-    /* 803053E0 */ void setTevStage(u8, u8, bool);
-    /* 80305688 */ void setStage(J2DTevStage*, J2DPictureEx::stage_enum);
-    /* 80305928 */ void setTevKColor(u8);
-    /* 80305C70 */ void setTevKColorSel(u8);
-    /* 80305D18 */ void setTevKAlphaSel(u8);
-    /* 80305DC0 */ void shiftSetBlendRatio(u8, f32, bool, bool);
-    /* 80305ED4 */ void setBlendColorRatio(f32, f32);
-    /* 80305F34 */ void setBlendAlphaRatio(f32, f32);
-    /* 80305F94 */ void changeTexture(ResTIMG const*, u8);
-    /* 80306298 */ void changeTexture(char const*, u8, JUTPalette*);
-    /* 80306134 */ void changeTexture(ResTIMG const*, u8, JUTPalette*);
-    /* 803060DC */ void changeTexture(char const*, u8);
-    /* 803062F8 */ void getTexture(u8) const;
-    /* 80306350 */ void getTextureCount() const;
-    /* 80306370 */ void setBlack(JUtility::TColor);
-    /* 803063F8 */ void setWhite(JUtility::TColor);
-    /* 80306480 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
-    /* 80306664 */ void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
-    /* 80306824 */ void isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
-    /* 803068F8 */ void getBlack() const;
-    /* 80306958 */ void getWhite() const;
-    /* 803069B8 */ void setAlpha(u8);
-    /* 803069D8 */ void setCullBack(_GXCullMode);
-    /* 80307168 */ void setCullBack(bool);
-    /* 80306A0C */ void rewriteAlpha();
-    /* 80306A24 */ void isUsed(ResTIMG const*);
-    /* 803071A4 */ void isUsed(ResFONT const*);
-    /* 80306C70 */ void animationPane(J2DAnmTransform const*);
-    /* 80306DC8 */ void getUsableTlut(u8);
-    /* 80306F94 */ void prepend(char const*, f32);
-    /* 80306F34 */ void prepend(JUTTexture*, f32);
-    /* 80306FC4 */ void prepend(ResTIMG const*, JUTPalette*, f32);
-    /* 80306F64 */ void prepend(char const*, JUTPalette*, f32);
-    /* 80306FF4 */ void prepend(ResTIMG const*, f32);
-};
-
-struct J2DPicture {
-    /* 800202CC */ void setBlendRatio(f32, f32);
-    /* 802FC050 */ J2DPicture();
-    /* 802FCFF0 */ ~J2DPicture();
-    /* 802FDB28 */ void drawSelf(f32, f32);
-    /* 802FF1D0 */ void getTlutID(ResTIMG const*, u8);
-    /* 802FF2E8 */ s32 getTypeID() const;
-};
-
-//
 // Forward References:
 //
 
@@ -339,23 +134,6 @@ extern "C" void getTlutID__10J2DPictureFPC7ResTIMGUc();
 extern "C" void func_802FF204(void* _this);
 extern "C" s32 getTypeID__10J2DPictureCFv();
 extern "C" void getVisibility__20J2DAnmVisibilityFullCFUsPUc();
-extern "C" void PSMTXIdentity();
-extern "C" void PSMTXConcat();
-extern "C" void GXSetVtxDesc();
-extern "C" void GXClearVtxDesc();
-extern "C" void GXSetVtxAttrFmt();
-extern "C" void GXSetNumTexGens();
-extern "C" void GXBegin();
-extern "C" void GXSetChanMatColor();
-extern "C" void GXSetChanCtrl();
-extern "C" void GXSetNumIndStages();
-extern "C" void GXSetTevDirect();
-extern "C" void GXSetTevOp();
-extern "C" void GXSetTevSwapModeTable();
-extern "C" void GXSetTevOrder();
-extern "C" void GXSetNumTevStages();
-extern "C" void GXLoadPosMtxImm();
-extern "C" void GXSetCurrentMtx();
 extern "C" void __construct_array();
 extern "C" void _savegpr_23();
 extern "C" void _savegpr_25();
@@ -496,7 +274,8 @@ asm J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1,
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J2DPictureEx::~J2DPictureEx() {
+extern "C" asm void __dt__12J2DPictureExFv() {
+    // asm J2DPictureEx::~J2DPictureEx() {
     nofralloc
 #include "asm/JSystem/J2DGraph/J2DPictureEx/__dt__12J2DPictureExFv.s"
 }