diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 64b2a37b76..0493541afe 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -5,8 +5,6 @@
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/JUtility/JUTPalette.h"
 
-typedef struct _GXColor GXColor;
-typedef struct _GXColorS10 GXColorS10;
 class J2DScreen;
 struct ResTIMG;
 
@@ -66,7 +64,7 @@ public:
         }
     }
     virtual ~J2DAnmVtxColor() {}
-    virtual void getColor(u8, u16, _GXColor*) const {}
+    virtual void getColor(u8, u16, GXColor*) const {}
     u16 getAnmTableNum(u8 param_0) const {
         J3D_PANIC(342, param_0 < 2, "Error : range over.");
         return mAnmTableNum[param_0];
@@ -101,7 +99,7 @@ public:
         }
     }
     virtual ~J2DAnmVtxColorKey() {}
-    virtual void getColor(u8, u16, _GXColor*) const;
+    virtual void getColor(u8, u16, GXColor*) const;
 
     /* 0x24 */ J3DAnmColorKeyTable* mInfoTable[2];
     /* 0x2C */ s16* mRValues;
@@ -122,7 +120,7 @@ public:
         }
     }
     virtual ~J2DAnmVtxColorFull() {}
-    virtual void getColor(u8, u16, _GXColor*) const;
+    virtual void getColor(u8, u16, GXColor*) const;
 
     /* 0x24 */ J3DAnmColorFullTable* mInfoTable[2];
     /* 0x2C */ u8* mRValues;
@@ -400,7 +398,7 @@ public:
     }
     virtual ~J2DAnmColor() {}
     virtual void searchUpdateMaterialID(J2DScreen*);
-    virtual void getColor(u16, _GXColor*) const {}
+    virtual void getColor(u16, GXColor*) const {}
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
     u16 getUpdateMaterialID(u16 i) const {
         J3D_PANIC(224, i < mUpdateMaterialNum, "Error : range over.");
@@ -430,7 +428,7 @@ public:
         mInfoTable = NULL;
     }
     virtual ~J2DAnmColorKey() {}
-    virtual void getColor(u16, _GXColor*) const;
+    virtual void getColor(u16, GXColor*) const;
 
     /* 0x30 */ s16* mRValues;
     /* 0x34 */ s16* mGValues;
@@ -468,7 +466,7 @@ public:
         mInfoTable = NULL;
     }
     virtual ~J2DAnmColorFull() {}
-    virtual void getColor(u16, _GXColor*) const;
+    virtual void getColor(u16, GXColor*) const;
 
     /* 0x30 */ u8* mRValues;
     /* 0x34 */ u8* mGValues;
diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h
index 36db0fe0a5..7a5a3e594a 100644
--- a/include/JSystem/J2DGraph/J2DMatBlock.h
+++ b/include/JSystem/J2DGraph/J2DMatBlock.h
@@ -69,7 +69,7 @@ class J2DTevBlock {
 public:
     virtual void initialize() {}
     virtual void setGX() {}
-    virtual void loadTexture(_GXTexMapID, u32) {}
+    virtual void loadTexture(GXTexMapID, u32) {}
     virtual u32 getType() = 0;
     virtual u8 getMaxStage() = 0;
     virtual void setTexNo(u32, u16) {}
@@ -124,7 +124,7 @@ public:
 
     virtual void initialize();
     virtual void setGX();
-    virtual void loadTexture(_GXTexMapID, u32);
+    virtual void loadTexture(GXTexMapID, u32);
     virtual u32 getType() { return 'TVB1'; }
     virtual u8 getMaxStage() { return 1; }
     virtual void setTexNo(u32 index, u16 texNo) {
@@ -264,7 +264,7 @@ public:
 
     virtual void initialize();
     virtual void setGX();
-    virtual void loadTexture(_GXTexMapID, u32);
+    virtual void loadTexture(GXTexMapID, u32);
     virtual u32 getType() { return 'TVB2'; }
     virtual u8 getMaxStage() { return 2; }
     virtual void setTexNo(u32 index, u16 texNo) {
@@ -406,7 +406,7 @@ public:
 
     virtual void initialize();
     virtual void setGX();
-    virtual void loadTexture(_GXTexMapID, u32);
+    virtual void loadTexture(GXTexMapID, u32);
     virtual u32 getType() { return 'TVB4'; }
     virtual u8 getMaxStage() { return 4; }
     virtual void setTexNo(u32 index, u16 texNo) {
@@ -548,7 +548,7 @@ public:
 
     virtual void initialize();
     virtual void setGX();
-    virtual void loadTexture(_GXTexMapID, u32);
+    virtual void loadTexture(GXTexMapID, u32);
     virtual u32 getType() { return 'TVB8'; }
     virtual u8 getMaxStage() { return 8; }
     virtual void setTexNo(u32 index, u16 texNo) {
@@ -691,7 +691,7 @@ public:
 
     virtual void initialize();
     virtual void setGX();
-    virtual void loadTexture(_GXTexMapID, u32);
+    virtual void loadTexture(GXTexMapID, u32);
     virtual u32 getType() { return 'TV16'; }
     virtual u8 getMaxStage() { return 16; }
     virtual void setTexNo(u32 index, u16 texNo) {
diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/include/JSystem/J2DGraph/J2DMaterialFactory.h
index 211b8be180..f82788d57c 100644
--- a/include/JSystem/J2DGraph/J2DMaterialFactory.h
+++ b/include/JSystem/J2DGraph/J2DMaterialFactory.h
@@ -40,8 +40,6 @@ struct J2DMaterialBlock {
     BE(u32) field_0x64;
 };
 
-typedef struct _GXColor GXColor;
-typedef struct _GXColorS10 GXColorS10;
 struct J2DAlphaCompInfo;
 struct J2DBlendInfo;
 struct J2DColorChanInfo;
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index b1677223ad..3a17405b97 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -96,7 +96,7 @@ public:
 
         setCullBack(mode);
     }
-    /* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode);
+    /* vt 0x20 */ virtual void setCullBack(GXCullMode cmode);
     /* vt 0x24 */ virtual void setAlpha(u8 alpha) {
         mAlpha = alpha;
     };
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index f6805ea2bc..70761e972d 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -130,12 +130,12 @@ public:
                 JGeometry::TBox2<f32>(param_4, param_5, param_4 + param_6, param_5 + param_7));
     }
     virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    virtual void load(_GXTexMapID param_0, u8 param_1) {
+    virtual void load(GXTexMapID param_0, u8 param_1) {
         if (param_1 < mTextureNum && param_1 < 2 && mTexture[param_1] != NULL) {
             mTexture[param_1]->load(param_0);
         }
     }
-    virtual void load(u8 param_0) { load((_GXTexMapID)param_0, param_0); }
+    virtual void load(u8 param_0) { load((GXTexMapID)param_0, param_0); }
     virtual void setBlendRatio(f32 param_0, f32 param_1) {
         setBlendColorRatio(param_0, param_1);
         setBlendAlphaRatio(param_0, param_1);
diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h
index d58530c037..86a99cd5fb 100644
--- a/include/JSystem/J2DGraph/J2DPictureEx.h
+++ b/include/JSystem/J2DGraph/J2DPictureEx.h
@@ -39,7 +39,7 @@ public:
 
     virtual ~J2DPictureEx();
     virtual void setCullBack(bool);
-    virtual void setCullBack(_GXCullMode);
+    virtual void setCullBack(GXCullMode);
     virtual void setAlpha(u8);
     virtual void drawSelf(f32, f32, f32 (*)[3][4]);
     virtual bool isUsed(ResTIMG const*);
@@ -80,7 +80,7 @@ public:
     virtual void drawOut(f32, f32, f32, f32, f32, f32);
     virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
     virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    virtual void load(_GXTexMapID, u8);
+    virtual void load(GXTexMapID, u8);
     virtual void load(u8);
     virtual void setBlendColorRatio(f32, f32);
     virtual void setBlendAlphaRatio(f32, f32);
diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h
index 470704562d..f0c2b389ca 100644
--- a/include/JSystem/J2DGraph/J2DTextBoxEx.h
+++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h
@@ -26,7 +26,7 @@ public:
 
     virtual ~J2DTextBoxEx();
     virtual void setCullBack(bool);
-    virtual void setCullBack(_GXCullMode);
+    virtual void setCullBack(GXCullMode);
     virtual void setAlpha(u8);
     virtual void drawSelf(f32, f32, f32 (*)[3][4]);
     virtual bool isUsed(ResTIMG const*);
diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/include/JSystem/J2DGraph/J2DWindowEx.h
index 467d70864e..42bcfcc774 100644
--- a/include/JSystem/J2DGraph/J2DWindowEx.h
+++ b/include/JSystem/J2DGraph/J2DWindowEx.h
@@ -31,7 +31,7 @@ public:
 
     virtual ~J2DWindowEx();
     virtual void setCullBack(bool);
-    virtual void setCullBack(_GXCullMode);
+    virtual void setCullBack(GXCullMode);
     virtual void setAlpha(u8);
     virtual void drawSelf(f32, f32, f32 (*)[3][4]);
     virtual bool isUsed(ResTIMG const*);
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index cd313d68ea..3ceccac8a4 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -53,9 +53,6 @@ struct J3DAnmTransform_ANK1 {
     /* 0x20 */ BE(u32) translation_data_offset;
 };
 
-typedef struct _GXColor GXColor;
-typedef struct _GXColorS10 GXColorS10;
-
 /**
  * @ingroup jsystem-j3d
  * 
@@ -837,8 +834,8 @@ public:
 class J3DAnmTevRegKey : public J3DAnmBase {
 public:
     J3DAnmTevRegKey();
-    void getTevColorReg(u16, _GXColorS10*) const;
-    void getTevKonstReg(u16, _GXColor*) const;
+    void getTevColorReg(u16, GXColorS10*) const;
+    void getTevKonstReg(u16, GXColor*) const;
     void searchUpdateMaterialID(J3DMaterialTable*);
     void searchUpdateMaterialID(J3DModelData*);
 
diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h
index b01dc7187f..7ce625f753 100644
--- a/include/JSystem/J3DGraphBase/J3DGD.h
+++ b/include/JSystem/J3DGraphBase/J3DGD.h
@@ -81,8 +81,8 @@ void J3DGDSetTexLookupMode(GXTexMapID, GXTexWrapMode, GXTexWrapMode, GXTexFilter
 void J3DGDSetTexImgAttr(GXTexMapID, u16, u16, GXTexFmt);
 void J3DGDSetTexImgPtr(GXTexMapID, void*);
 void J3DGDSetTexImgPtrRaw(GXTexMapID, u32);
-void J3DGDSetTexTlut(GXTexMapID, u32, _GXTlutFmt);
-void J3DGDLoadTlut(void*, u32, _GXTlutSize);
+void J3DGDSetTexTlut(GXTexMapID, u32, GXTlutFmt);
+void J3DGDLoadTlut(void*, u32, GXTlutSize);
 void J3DGDSetIndTexMtx(GXIndTexMtxID, f32 (*)[3], s8);
 void J3DGDSetIndTexCoordScale(GXIndTexStageID, GXIndTexScale, GXIndTexScale, GXIndTexScale,
                               GXIndTexScale);
@@ -93,7 +93,7 @@ void J3DGDSetTevOrder(GXTevStageID, GXTexCoordID, GXTexMapID, GXChannelID, GXTex
 void J3DGDSetTevKColor(GXTevKColorID, GXColor);
 void J3DGDSetTevColorS10(GXTevRegID, GXColorS10);
 void J3DGDSetFog(GXFogType, f32, f32, f32, f32, GXColor);
-void J3DGDSetFogRangeAdj(u8, u16, _GXFogAdjTable*);
+void J3DGDSetFogRangeAdj(GXBool, u16, _GXFogAdjTable*);
 
 inline void J3DGDSetNumChans(u8 numChans) {
     J3DGDWriteXFCmd(0x1009, numChans);
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 4b52fe4526..0735d8aa6e 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -125,8 +125,8 @@ public:
     static const int kVcdVatDLSize = 0xC0;
 
     void initialize();
-    void addTexMtxIndexInDL(_GXAttr, u32);
-    void addTexMtxIndexInVcd(_GXAttr);
+    void addTexMtxIndexInDL(GXAttr, u32);
+    void addTexMtxIndexInVcd(GXAttr);
     void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
     u16 countBumpMtxNum() const;
     void loadVtxArray() const;
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 0d88487f5f..bd870d07e4 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -145,13 +145,13 @@ struct J3DSys {
     void setModelDrawMtx(Mtx* pMtxArr) {
         J3D_ASSERT_NULLPTR(230, pMtxArr);
         mModelDrawMtx = pMtxArr;
-        GXSetArray(GX_POS_MTX_ARRAY, mModelDrawMtx, sizeof(*mModelDrawMtx));
+        GXSETARRAY(GX_POS_MTX_ARRAY, mModelDrawMtx, sizeof(*mModelDrawMtx), sizeof(*mModelDrawMtx));
     }
 
     void setModelNrmMtx(Mtx33* pMtxArr) {
         J3D_ASSERT_NULLPTR(241, pMtxArr);
         mModelNrmMtx = pMtxArr;
-        GXSetArray(GX_NRM_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx));
+        GXSETARRAY(GX_POS_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx), sizeof(*mModelNrmMtx));
     }
 
     void* getVtxPos() { return mVtxPos; }
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index f52a2f360e..50b2dbeec0 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -5,7 +5,6 @@
 #include <dolphin/mtx.h>
 #include "dusk/endian_gx.hpp"
 
-typedef struct _GXColor GXColor;
 class J3DModel;
 class J3DAnmVtxColor;
 class J3DVertexBuffer;
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index b451f584bf..0df3b65171 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -7,8 +7,6 @@
 #include "JSystem/JUtility/JUTXfb.h"
 #include <dolphin/os.h>
 
-typedef struct _GXColor GXColor;
-typedef struct _GXRenderModeObj GXRenderModeObj;
 class JKRHeap;
 
 typedef void (*JFWDisplayUnkFunc)(void);
@@ -49,7 +47,7 @@ public:
 
     void ctor_subroutine(bool);
     JFWDisplay(JKRHeap*, JUTXfb::EXfbNumber, bool);
-    static JFWDisplay* createManager(_GXRenderModeObj const*, JKRHeap*,
+    static JFWDisplay* createManager(GXRenderModeObj const*, JKRHeap*,
                                                     JUTXfb::EXfbNumber, bool);
     void prepareCopyDisp();
     void drawendXfb_single();
@@ -61,9 +59,9 @@ public:
     void waitBlanking(int);
     void threadSleep(s64);
     void clearEfb_init();
-    void clearEfb(int, int, int, int, _GXColor);
+    void clearEfb(int, int, int, int, GXColor);
     void clearEfb();
-    void clearEfb(_GXColor);
+    void clearEfb(GXColor);
     void calcCombinationRatio();
 
     virtual void beginRender();
diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h
index cf6ac86b69..230df0554f 100644
--- a/include/JSystem/JFramework/JFWSystem.h
+++ b/include/JSystem/JFramework/JFWSystem.h
@@ -4,7 +4,6 @@
 #include <dolphin/types.h>
 #include "JSystem/JUtility/JUTAssert.h"
 
-typedef struct _GXRenderModeObj GXRenderModeObj;
 class JKRExpHeap;
 class JKRThread;
 class JUTConsole;
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index 691096babe..3e3a6cba02 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -142,7 +142,7 @@ public:
     void setGlobalAlpha(u8 alpha) { mGlobalPrmClr.a = alpha; }
     u8 getGlobalAlpha() const { return mGlobalPrmClr.a; }
     void getGlobalPrmColor(GXColor& color) { color = mGlobalPrmClr; }
-    void getGlobalPrmColor(_GXColor* color) const { *color = mGlobalPrmClr; }
+    void getGlobalPrmColor(GXColor* color) const { *color = mGlobalPrmClr; }
     void setGlobalPrmColor(u8 r, u8 g, u8 b) { mGlobalPrmClr.r = r; mGlobalPrmClr.g = g; mGlobalPrmClr.b = b; }
     void setGlobalEnvColor(u8 r, u8 g, u8 b) { mGlobalEnvClr.r = r; mGlobalEnvClr.g = g; mGlobalEnvClr.b = b; }
     void setVolumeSize(u16 size) { mVolumeSize = size; }
diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h
index 9f743d6360..72e24770bb 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-object.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-object.h
@@ -6,8 +6,6 @@
 #include <limits>
 #include <cmath>
 
-typedef struct _GXColor GXColor;
-
 namespace JStudio {
 namespace data {
     enum TEOperationData {
diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h
index 8698901afb..9d09e3419f 100644
--- a/include/JSystem/JUtility/JUTCacheFont.h
+++ b/include/JSystem/JUtility/JUTCacheFont.h
@@ -55,7 +55,7 @@ public:
     void prepend(JUTCacheFont::TGlyphCacheInfo*);
 
     virtual ~JUTCacheFont();
-    virtual void loadImage(int, _GXTexMapID);
+    virtual void loadImage(int, GXTexMapID);
     virtual void setBlock();
 
     void setPagingType(EPagingType type) { mPagingType = type; }
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index 522551dd63..fbf71ad6f1 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -8,7 +8,6 @@
 #include <dolphin/os.h>
 #include "global.h"
 
-typedef struct _GXRenderModeObj GXRenderModeObj;
 typedef struct OSContext OSContext;
 class JUTDirectPrint;
 
@@ -18,10 +17,10 @@ class JUTDirectPrint;
 */
 class JUTExternalFB {
 public:
-    JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32);
+    JUTExternalFB(GXRenderModeObj*, GXGamma, void*, u32);
 
 private:
-    /* 0x00 */ _GXRenderModeObj* mRenderMode;
+    /* 0x00 */ GXRenderModeObj* mRenderMode;
     /* 0x04 */ u32 mSize;
     /* 0x08 */ u32 field_0x08;
     /* 0x0C */ u16 field_0x0C;
diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h
index 7b6ec796da..65973b89ad 100644
--- a/include/JSystem/JUtility/JUTResFont.h
+++ b/include/JSystem/JUtility/JUTResFont.h
@@ -38,7 +38,7 @@ public:
     virtual int getFontType() const;
     virtual ResFONT* getResFont() const;
     virtual bool isLeadByte(int) const;
-    virtual void loadImage(int, _GXTexMapID);
+    virtual void loadImage(int, GXTexMapID);
     virtual void setBlock();
 
     JUTResFont(ResFONT const*, JKRHeap*);
@@ -48,7 +48,7 @@ public:
     bool initiate(ResFONT const*, JKRHeap*);
     bool protected_initiate(ResFONT const*, JKRHeap*);
     void countBlock();
-    void loadFont(int, _GXTexMapID, JUTFont::TWidth*);
+    void loadFont(int, GXTexMapID, JUTFont::TWidth*);
     int getFontCode(int) const;
     int convertSjis(int, BE(u16)*) const;
 
diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h
index 3c3eeeadaa..11278fa2b6 100644
--- a/include/JSystem/JUtility/JUTVideo.h
+++ b/include/JSystem/JUtility/JUTVideo.h
@@ -4,6 +4,7 @@
 #include <dolphin/gx.h>
 #include <dolphin/os.h>
 #include <dolphin/os.h>
+#include <dolphin/vi.h>
 
 typedef u8 (*Pattern)[2];
 
@@ -54,7 +55,7 @@ private:
     static OSTick sVideoInterval;
 
 private:
-    /* 0x04 */ _GXRenderModeObj* mRenderObj;
+    /* 0x04 */ GXRenderModeObj* mRenderObj;
     /* 0x08 */ u32 field_0x8;
     /* 0x0C */ u32 mRetraceCount;
     /* 0x10 */ u32 field_0x10;
diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h
index c4bf605b9c..acc48739fc 100644
--- a/include/JSystem/JUtility/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/JUtility/JUTVideo.h"
 
-typedef struct _GXRenderModeObj GXRenderModeObj;
 class JKRHeap;
 
 /**
@@ -21,7 +20,7 @@ public:
 
     void clearIndex();
     void common_init(int);
-    JUTXfb(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber);
+    JUTXfb(GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber);
     ~JUTXfb();
     void delXfb(int);
     static JUTXfb* createManager(JKRHeap*, JUTXfb::EXfbNumber);
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index f80c33b823..141dd33bad 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -8,8 +8,8 @@
 #include "SSystem/SComponent/c_m3d_g_tri.h"
 #include "SSystem/SComponent/c_m3d_g_vtx.h"
 #include "f_pc/f_pc_manager.h"
+#include <dolphin/gx/GXStruct.h>
 
-typedef struct _GXColor GXColor;
 class fopAc_ac_c;
 
 enum CcG_Tg_HitMark {
@@ -447,7 +447,7 @@ public:
     virtual cCcD_GObjInf* GetGObjInf() { return NULL; }
     virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; }
     virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; }
-    virtual void Draw(_GXColor const&) {}
+    virtual void Draw(GXColor const&) {}
     void ct();
     void Set(cCcD_SrcObj const&);
     fopAc_ac_c* GetAc();
diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h
index 9fc71f12e5..b453b41527 100644
--- a/include/d/actor/d_a_npc.h
+++ b/include/d/actor/d_a_npc.h
@@ -657,7 +657,7 @@ public:
     int loadRes(s8 const*, char const**);
     void deleteRes(s8 const*, char const**);
     int execute();
-    int draw(BOOL, BOOL, f32, _GXColorS10*, f32, BOOL, BOOL, BOOL);
+    int draw(BOOL, BOOL, f32, GXColorS10*, f32, BOOL, BOOL, BOOL);
     void setEnvTevColor();
     void setRoomNo();
     int checkEndAnm(f32);
diff --git a/include/d/actor/d_a_npc4.h b/include/d/actor/d_a_npc4.h
index 8b82886e62..952c023889 100644
--- a/include/d/actor/d_a_npc4.h
+++ b/include/d/actor/d_a_npc4.h
@@ -304,7 +304,7 @@ public:
         initialize();
     }
     BOOL execute();
-    int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
+    int draw(BOOL, BOOL, f32, GXColorS10*, BOOL);
     static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,
                                              dCcD_GObjInf*);
     static void* srchAttnActor1(void*, void*);
diff --git a/include/d/actor/d_a_npc_chat.h b/include/d/actor/d_a_npc_chat.h
index 67814c27cc..4ec81ee4c0 100644
--- a/include/d/actor/d_a_npc_chat.h
+++ b/include/d/actor/d_a_npc_chat.h
@@ -60,7 +60,7 @@ public:
     int Delete();
     int Execute();
     int Draw();
-    int draw(int, int, f32, _GXColorS10*, int);
+    int draw(int, int, f32, GXColorS10*, int);
     int ctrlJoint(J3DJoint*, J3DModel*);
     static int createHeapCallBack(fopAc_ac_c*);
     static int ctrlJointCallBack(J3DJoint*, int);
diff --git a/include/d/actor/d_a_npc_zrz.h b/include/d/actor/d_a_npc_zrz.h
index 55a9159945..4201047ed7 100644
--- a/include/d/actor/d_a_npc_zrz.h
+++ b/include/d/actor/d_a_npc_zrz.h
@@ -62,7 +62,7 @@ public:
     int Delete();
     int Execute();
     int Draw();
-    int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
+    int draw(BOOL, BOOL, f32, GXColorS10*, BOOL);
     int ctrlJoint(J3DJoint*, J3DModel*);
     static int createHeapCallBack(fopAc_ac_c*);
     static int ctrlJointCallBack(J3DJoint*, int);
diff --git a/include/d/actor/d_a_obj_kamakiri.h b/include/d/actor/d_a_obj_kamakiri.h
index 9f2a2ff790..15e3db5d9e 100644
--- a/include/d/actor/d_a_obj_kamakiri.h
+++ b/include/d/actor/d_a_obj_kamakiri.h
@@ -47,7 +47,7 @@ public:
             mpBrkAnm->entry(model->getModelData());
             mpMorfSO->entryDL();
             if (field_0x9c0 == 0) {
-                _GXTexObj* texObj = dDlst_shadowControl_c::getSimpleTex();
+                GXTexObj* texObj = dDlst_shadowControl_c::getSimpleTex();
                 dComIfGd_setSimpleShadow(&current.pos, mObjAcch.GetGroundH(), 15.0f, mObjAcch.m_gnd, 0, -0.6f, texObj);
             }
         }
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 098749397d..9a0344eece 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -1237,10 +1237,10 @@ int dComIfG_TimerDeleteRequest(int i_mode);
 int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*);
 
 int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 i_angle,
-                             f32 param_5, _GXTexObj* i_tex);
+                             f32 param_5, GXTexObj* i_tex);
 int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
                        f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
-                       dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12);
+                       dKy_tevstr_c* param_9, s16 param_10, f32 param_11, GXTexObj* param_12);
 
 inline dSv_info_c* dComIfGs_getSaveInfo() {
     return &g_dComIfG_gameInfo.info;
@@ -3192,8 +3192,8 @@ inline JPABaseEmitter* dComIfGp_particle_setPolyColor(u16 param_1, cBgS_PolyInfo
         param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10);
 }
 
-inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* i_pos, u8 param_2, _GXColor& param_3,
-                                        _GXColor& param_4, int param_5, float param_6) {
+inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* i_pos, u8 param_2, GXColor& param_3,
+                                        GXColor& param_4, int param_5, float param_6) {
     g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0, i_pos, 0, param_2, param_3, param_4,
                                                      param_5, param_6);
 }
@@ -4437,7 +4437,7 @@ inline int dComIfGd_setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cX
 }
 
 inline int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cXyz* param_3, s16 angle,
-                                    f32 param_5, _GXTexObj* tex) {
+                                    f32 param_5, GXTexObj* tex) {
     return g_dComIfG_gameInfo.drawlist.setSimpleShadow(pos, param_1, param_2, param_3, angle,
                                                        param_5, tex);
 }
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index c287b16ce9..e5d1da07a8 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -95,7 +95,7 @@ public:
 class dDlst_effectLine_c : public dDlst_base_c {
 public:
     virtual void draw();
-    void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
+    void update(cXyz&, GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
 
     f32 getRndValue(f32 param_0, f32 param_1) { return mRnd.getValue(param_0, param_1); }
     f32 getRndFX(f32 param_0) { return mRnd.getFX(param_0); }
@@ -199,11 +199,11 @@ public:
 class dDlst_shadowSimple_c {
 public:
     void draw();
-    void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
+    void set(cXyz*, f32, f32, cXyz*, s16, f32, GXTexObj*);
     dDlst_shadowSimple_c();
 
     /* 0x00 */ u8 mAlpha;
-    /* 0x04 */ _GXTexObj* mpTexObj;
+    /* 0x04 */ GXTexObj* mpTexObj;
     /* 0x08 */ Mtx mVolumeMtx;
     /* 0x38 */ Mtx mMtx;
 };  // Size: 0x68
@@ -289,7 +289,7 @@ public:
     void draw(f32 (*)[4]);
     int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
     bool addReal(u32, J3DModel*);
-    int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
+    int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, GXTexObj*);
     static void setSimpleTex(ResTIMG const*);
 
     static GXTexObj* getSimpleTex() { return &mSimpleTexObj; }
@@ -305,7 +305,7 @@ private:
     /* 0x0000C */ dDlst_shadowSimple_c mSimple[128];
     /* 0x0340C */ int mNextID;
     /* 0x03410 */ dDlst_shadowReal_c mReal[8];
-    /* 0x15EB0 */ _GXTexObj field_0x15eb0[2];
+    /* 0x15EB0 */ GXTexObj field_0x15eb0[2];
     /* 0x15EF0 */ void* field_0x15ef0[2];
 };
 
@@ -442,7 +442,7 @@ public:
     }
 
     int setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, s16 param_4,
-                        f32 param_5, _GXTexObj* param_6) {
+                        f32 param_5, GXTexObj* param_6) {
         return mShadowControl.setSimple(param_0, param_1, param_2, param_3, param_4, param_5,
                                         param_6);
     }
diff --git a/include/d/d_kankyo_rain.h b/include/d/d_kankyo_rain.h
index 0feb428cd2..27eaa3886a 100644
--- a/include/d/d_kankyo_rain.h
+++ b/include/d/d_kankyo_rain.h
@@ -4,17 +4,16 @@
 #include <dolphin/mtx.h>
 
 struct cXyz;
-struct _GXColor;
 
-void dKyr_drawSun(Mtx param_0, cXyz* param_1, _GXColor& param_2, u8** param_3);
-void dKyr_drawLenzflare(Mtx param_0, cXyz* param_1, _GXColor& param_2, u8** param_3);
+void dKyr_drawSun(Mtx param_0, cXyz* param_1, GXColor& param_2, u8** param_3);
+void dKyr_drawLenzflare(Mtx param_0, cXyz* param_1, GXColor& param_2, u8** param_3);
 void dKyr_drawSibuki(Mtx param_0, u8** param_1);
 void dKyr_drawRain(Mtx param_0, u8** param_1);
 void dKyr_drawSnow(Mtx param_0, u8** param_1);
 void dKyr_drawStar(Mtx param_0, u8** param_1);
 void drawCloudShadow(Mtx param_0, u8** param_1);
 void dKyr_drawHousi(Mtx param_0, u8** param_1);
-void drawVrkumo(Mtx param_0, _GXColor& param_1, u8** param_2);
+void drawVrkumo(Mtx param_0, GXColor& param_1, u8** param_2);
 void dKyr_odour_draw(Mtx param_0, u8** param_1);
 void dKyr_mud_draw(Mtx param_0, u8** param_1);
 void dKyr_evil_draw(Mtx param_0, u8** param_1);
diff --git a/include/d/d_map_path.h b/include/d/d_map_path.h
index bac1084a16..d665b586c5 100644
--- a/include/d/d_map_path.h
+++ b/include/d/d_map_path.h
@@ -9,7 +9,7 @@ struct dMpath_RGB5A3_s {
 };
 
 namespace dMpath_ColorCnv_n {
-    void convertRGB5A3_To_GXColor(_GXColor&, const dMpath_RGB5A3_s&);
+    void convertRGB5A3_To_GXColor(GXColor&, const dMpath_RGB5A3_s&);
 }
 
 struct dMpath_RGB5A3_palDt_s {
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index ab8a3be574..5130a7afa6 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -37,7 +37,7 @@ public:
     dPa_simpleEcallBack();
     JPABaseEmitter* create(JPAEmitterManager*, u16, u8);
     JPABaseEmitter* createEmitter(JPAEmitterManager*);
-    u32 set(cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&,
+    u32 set(cXyz const*, dKy_tevstr_c const*, u8, GXColor const&, GXColor const&,
                             int, f32);
 
     virtual ~dPa_simpleEcallBack() {}
@@ -361,20 +361,20 @@ public:
     void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*,
                                        cXyz const*, s8);
     JPABaseEmitter* set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8,
-                           dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*,
+                           dPa_levelEcallBack*, s8, GXColor const*, GXColor const*, cXyz const*,
                            f32);
     u32 set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                           cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                           _GXColor const*, cXyz const*, f32);
-    static s32 getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*);
+                           cXyz const*, u8, dPa_levelEcallBack*, s8, GXColor const*,
+                           GXColor const*, cXyz const*, f32);
+    static s32 getPolyColor(cBgS_PolyInfo&, int, GXColor*, GXColor*, u8*, f32*);
     u32 setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
                                csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8,
                                cXyz const*);
     JPABaseEmitter* setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                                 cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*);
     bool newSimple(u16, u8, u32*);
-    u32 setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&,
-                                  _GXColor const&, int, f32);
+    u32 setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, GXColor const&,
+                                  GXColor const&, int, f32);
     dPa_simpleEcallBack* getSimple(u16);
     u32 setStopContinue(u32);
     u32 setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index fbb62fc4d5..1462ad2032 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -548,8 +548,8 @@ public:
 class mDoExt_3DlineMat0_c : public mDoExt_3DlineMat_c {
 public:
     int init(u16, u16, int);
-    void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);
-    void update(int, _GXColor&, dKy_tevstr_c*);
+    void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
+    void update(int, GXColor&, dKy_tevstr_c*);
 
     virtual int getMaterialID() { return 0; }
     virtual void setMaterial();
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 36ee7609b0..298af48593 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -76,11 +76,11 @@ public:
     static void create();
     static void beginRender();
     static void fadeOut(f32);
-    static void fadeOut(f32, _GXColor&);
-    static void fadeIn(f32 fadeSpeed, _GXColor& fadeColor) {
+    static void fadeOut(f32, GXColor&);
+    static void fadeIn(f32 fadeSpeed, GXColor& fadeColor) {
         fadeOut(-fadeSpeed, fadeColor);
     }
-    static void fadeOut_f(f32, _GXColor&);
+    static void fadeOut_f(f32, GXColor&);
     static void onBlure(const Mtx);
     static void onBlure();
     static void calcFade();
@@ -106,7 +106,7 @@ public:
     static void endFrame() { JFWDisplay::getManager()->endFrame(); }
     static void offFade() { mFade = 0; }
     static u8 isFade() { return mFade; }
-    static void fadeIn_f(f32 i_fadeSpeed, _GXColor& i_fadeColor) { fadeOut_f(-i_fadeSpeed, i_fadeColor); }
+    static void fadeIn_f(f32 i_fadeSpeed, GXColor& i_fadeColor) { fadeOut_f(-i_fadeSpeed, i_fadeColor); }
     static void offBlure() { mBlureFlag = false; }
     static u8 isBlure() { return mBlureFlag; }
     static void setBlureRate(u8 i_rate) { mBlureRate = i_rate; }
diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h
index d53678ef8e..c13288103e 100644
--- a/include/m_Do/m_Do_lib.h
+++ b/include/m_Do/m_Do_lib.h
@@ -2,9 +2,8 @@
 #define M_DO_M_DO_LIB_H
 
 #include "JSystem/J3DU/J3DUClipper.h"
+#include <dolphin/gx/GXStruct.h>
 
-typedef struct _GXTexObj GXTexObj;
-typedef struct _GXTlutObj GXTlutObj;
 typedef struct Vec Vec;
 struct ResTIMG;
 
diff --git a/src/JSystem/J2DGraph/J2DAnimation.cpp b/src/JSystem/J2DGraph/J2DAnimation.cpp
index 9a0405c4d9..6b0968c764 100644
--- a/src/JSystem/J2DGraph/J2DAnimation.cpp
+++ b/src/JSystem/J2DGraph/J2DAnimation.cpp
@@ -264,7 +264,7 @@ void J2DAnmColor::searchUpdateMaterialID(J2DScreen* pScreen) {
     }
 }
 
-void J2DAnmColorFull::getColor(u16 param_0, _GXColor* pColor) const {
+void J2DAnmColorFull::getColor(u16 param_0, GXColor* pColor) const {
     J3D_PANIC(432, param_0 < mUpdateMaterialNum, "Error : range over.");
     J3D_PANIC(433, pColor, "Error : null pointer.");
     J3DAnmColorFullTable* info = &mInfoTable[param_0];
@@ -302,7 +302,7 @@ void J2DAnmColorFull::getColor(u16 param_0, _GXColor* pColor) const {
     }
 }
 
-void J2DAnmColorKey::getColor(u16 param_0, _GXColor* pColor) const {
+void J2DAnmColorKey::getColor(u16 param_0, GXColor* pColor) const {
     J3D_PANIC(490, param_0 < mUpdateMaterialNum, "Error : range over.");
     J3D_PANIC(491, pColor, "Error : null pointer.");
     J3DAnmColorKeyTable* info = &mInfoTable[param_0];
@@ -381,7 +381,7 @@ void J2DAnmColorKey::getColor(u16 param_0, _GXColor* pColor) const {
     }
 }
 
-void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const {
+void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, GXColor* pColor) const {
     J3D_PANIC(597, pColor, "Error : null pointer.");
     J3DAnmColorFullTable* info = &mInfoTable[param_0][param_1];
     u16 maxFrame = info->mRMaxFrame;
@@ -418,7 +418,7 @@ void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* pColor) con
     }
 }
 
-void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const {
+void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, GXColor* pColor) const {
     J3D_PANIC(658, pColor, "Error : null pointer.");
     J3DAnmColorKeyTable* info = &mInfoTable[param_0][param_1];
     f32 val;
diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/src/JSystem/J2DGraph/J2DPictureEx.cpp
index 6736d9ea20..36756ff411 100644
--- a/src/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/src/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -577,7 +577,7 @@ void J2DPictureEx::drawOut(JGeometry::TBox2<f32> const& param_0,
     GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
 }
 
-void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
+void J2DPictureEx::load(GXTexMapID param_0, u8 param_1) {
     if (mMaterial == NULL) {
         return;
     }
diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/src/JSystem/J2DGraph/J2DWindowEx.cpp
index 0056b0cc80..87bb4ef0a2 100644
--- a/src/JSystem/J2DGraph/J2DWindowEx.cpp
+++ b/src/JSystem/J2DGraph/J2DWindowEx.cpp
@@ -632,7 +632,7 @@ void J2DWindowEx::setAlpha(u8 param_0) {
     }
 }
 
-void J2DWindowEx::setCullBack(_GXCullMode param_0) {
+void J2DWindowEx::setCullBack(GXCullMode param_0) {
     mCullMode = param_0;
 
     for (int i = 0; i < 4; i++) {
@@ -845,7 +845,7 @@ void J2DWindowEx::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
 }
 
 void J2DWindowEx::setCullBack(bool param_0) {
-    _GXCullMode mode;
+    GXCullMode mode;
     if (param_0) {
         mode = GX_CULL_BACK;
     } else {
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index befdf34a90..a78ac59a19 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 
-void J3DGDSetVtxAttrFmtv(_GXVtxFmt, GXVtxAttrFmtList const*, bool);
+void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList const*, bool);
 void J3DFifoLoadPosMtxImm(Mtx, u32);
 void J3DFifoLoadNrmMtxImm(Mtx, u32);
 
diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/src/JSystem/J3DGraphBase/J3DTevs.cpp
index bc6ba63ac9..0c712dac81 100644
--- a/src/JSystem/J3DGraphBase/J3DTevs.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTevs.cpp
@@ -448,7 +448,7 @@ void makeTevSwapTable() {
 
 void J3DTexMtx::loadTexMtx(u32 param_0) const {
     GDOverflowCheck(0x35);
-	J3DGDLoadTexMtxImm((MtxP)mMtx, param_0 * 3 + 30, (_GXTexMtxType)mTexMtxInfo.mProjection);
+	J3DGDLoadTexMtxImm((MtxP)mMtx, param_0 * 3 + 30, (GXTexMtxType)mTexMtxInfo.mProjection);
 }
 
 void J3DTexMtx::loadPostTexMtx(u32 param_0) const {
@@ -456,7 +456,7 @@ void J3DTexMtx::loadPostTexMtx(u32 param_0) const {
     J3DGDLoadPostTexMtxImm((MtxP)mMtx, param_0 * 3 + 0x40);
 }
 
-static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, _GXTexMtxType param_3) {
+static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, GXTexMtxType param_3) {
     u16 addr = param_2 << 2;
     u8 len = param_3 == GX_MTX2x4 ? 8 : 12;
     J3DGDWriteXFCmdHdr(addr, len);
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index 75f24fc801..749009f275 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -281,7 +281,7 @@ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_fla
     mpModelData->setHierarchy(JSUConvertOffsetToPtr<J3DModelHierarchy>(i_block, i_block->mpHierarchy));
 }
 
-static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) {
+static GXCompType getFmtType(GXVtxAttrFmtList* i_fmtList, GXAttr i_attr) {
     for (; i_fmtList->attr != GX_VA_NULL; i_fmtList++) {
         if (i_fmtList->attr == i_attr) {
             return i_fmtList->type;
diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp
index 2bf0069ef1..b7ca359da0 100644
--- a/src/JSystem/JFramework/JFWDisplay.cpp
+++ b/src/JSystem/JFramework/JFWDisplay.cpp
@@ -53,7 +53,7 @@ JFWDisplay::~JFWDisplay() {
 
 JFWDisplay* JFWDisplay::sManager;
 
-JFWDisplay* JFWDisplay::createManager(_GXRenderModeObj const* p_rObj, JKRHeap* p_heap,
+JFWDisplay* JFWDisplay::createManager(GXRenderModeObj const* p_rObj, JKRHeap* p_heap,
                                       JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
     JUT_CONFIRM(173, sManager == NULL);
     if (p_rObj != NULL) {
diff --git a/src/JSystem/JParticle/JPAResource.cpp b/src/JSystem/JParticle/JPAResource.cpp
index efba3f323f..e6ffe884eb 100644
--- a/src/JSystem/JParticle/JPAResource.cpp
+++ b/src/JSystem/JParticle/JPAResource.cpp
@@ -926,8 +926,8 @@ void JPAResource::setPTev() {
     int center_offset = pEsp != NULL ? (pEsp->getScaleCenterX() + 3 * pEsp->getScaleCenterY()) * 0xC : 0x30;
     int pos_offset = center_offset + base_plane_type * 0x6C;
     int crd_offset = (pBsp->getTilingS() + 2 * pBsp->getTilingT()) * 8;
-    GXSetArray(GX_VA_POS, jpa_pos + pos_offset, 3);
-    GXSetArray(GX_VA_TEX0, jpa_crd + crd_offset, 2);
+    GXSETARRAY(GX_VA_POS, jpa_pos + pos_offset, ARRAY_SIZEU(jpa_pos) - pos_offset, 3);
+    GXSETARRAY(GX_VA_TEX0, jpa_crd + crd_offset, ARRAY_SIZEU(jpa_crd) - crd_offset, 2);
     GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
 
     if (pEts != NULL) {
@@ -969,8 +969,8 @@ void JPAResource::setCTev(JPAEmitterWorkData* work) {
     int base_plane_type = (pCsp->getType() == 3 || pCsp->getType() == 7) ?
         pCsp->getBasePlaneType() : 0;
     int pos_offset = 0x30 + base_plane_type * 0x6C;
-    GXSetArray(GX_VA_POS, jpa_pos + pos_offset, 3);
-    GXSetArray(GX_VA_TEX0, jpa_crd, 2);
+    GXSETARRAY(GX_VA_POS, jpa_pos + pos_offset, ARRAY_SIZEU(jpa_pos) - pos_offset, 3);
+    GXSETARRAY(GX_VA_TEX0, jpa_crd, ARRAY_SIZEU(jpa_crd), 2);
     GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP1, GX_COLOR_NULL);
     GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3C);
     GXSetTevDirect(GX_TEVSTAGE0);
diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp
index e6bcbf93e1..64adcd84dc 100644
--- a/src/JSystem/JUtility/JUTCacheFont.cpp
+++ b/src/JSystem/JUtility/JUTCacheFont.cpp
@@ -364,7 +364,7 @@ void JUTCacheFont::getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo* param_0,
                     GX_ANISO_1);
 }
 
-void JUTCacheFont::loadImage(int param_0, _GXTexMapID texMapId) {
+void JUTCacheFont::loadImage(int param_0, GXTexMapID texMapId) {
     TCachePage* cachePage = loadCache_char_subroutine(&param_0, false);
     if (cachePage != NULL) {
         mWidth = cachePage->field_0xc * (param_0 % (int)cachePage->field_0x16);
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index 01eeab7516..f09f65089c 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/src/JSystem/JUtility/JUTException.cpp
@@ -1,3 +1,5 @@
+#include <dolphin/vi.h>
+
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTException.h"
@@ -766,7 +768,7 @@ void JUTException::waitTime(s32 timeout_ms) {
 }
 
 void JUTException::createFB() {
-    _GXRenderModeObj* renderMode = &GXNtsc480Int;
+    GXRenderModeObj* renderMode = &GXNtsc480Int;
     void* end = (void*)OSGetArenaHi();
     u32 size = ((u16)ALIGN_NEXT((u16)renderMode->fbWidth, 16) * renderMode->xfbHeight) * 2;
 
@@ -994,7 +996,7 @@ void JUTException::createConsole(void* console_buffer, u32 console_buffer_size)
     }
 }
 
-JUTExternalFB::JUTExternalFB(_GXRenderModeObj* renderMode, GXGamma gamma, void* buffer, u32 size) {
+JUTExternalFB::JUTExternalFB(GXRenderModeObj* renderMode, GXGamma gamma, void* buffer, u32 size) {
     mRenderMode = renderMode;
     mSize = size;
     field_0x0C = 1;
diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/src/JSystem/JUtility/JUTPalette.cpp
index 6ac89c701f..a62998442b 100644
--- a/src/JSystem/JUtility/JUTPalette.cpp
+++ b/src/JSystem/JUtility/JUTPalette.cpp
@@ -29,7 +29,11 @@ void JUTPalette::storeTLUT(GXTlut param_0, GXTlutFmt param_1, JUTTransparency pa
 bool JUTPalette::load() {
     bool check = mNumColors != 0;
     if (check) {
+#if TARGET_PC
+        GXLoadTlut(&mTlutObj, (GXTlut)mTlutName);
+#else
         GXLoadTlut(&mTlutObj, mTlutName);
+#endif
     }
 
     return check;
diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/src/JSystem/JUtility/JUTVideo.cpp
index 77d9be31b1..e54edcb51c 100644
--- a/src/JSystem/JUtility/JUTVideo.cpp
+++ b/src/JSystem/JUtility/JUTVideo.cpp
@@ -14,7 +14,7 @@ OSTick JUTVideo::sVideoInterval;
 
 static bool data_80451544;
 
-JUTVideo* JUTVideo::createManager(_GXRenderModeObj const* param_0) {
+JUTVideo* JUTVideo::createManager(GXRenderModeObj const* param_0) {
     if (sManager == NULL) {
         sManager = new JUTVideo(param_0);
     }
diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp
index 59f4258f7e..dec0970516 100644
--- a/src/d/actor/d_a_e_nz.cpp
+++ b/src/d/actor/d_a_e_nz.cpp
@@ -373,8 +373,8 @@ static void e_nz_damage(e_nz_class* i_this) {
     }
 }
 
-static BOOL getPolyColor(cBgS_PolyInfo& param_1, int param_2, _GXColor* param_3,
-                             _GXColor* param_4, u8* param_5, f32* param_6) {
+static BOOL getPolyColor(cBgS_PolyInfo& param_1, int param_2, GXColor* param_3,
+                             GXColor* param_4, u8* param_5, f32* param_6) {
     if (!dComIfG_Bgsp().ChkPolySafe(param_1)) {
         return FALSE;
     }
diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp
index 6f60344479..43c133948e 100644
--- a/src/d/actor/d_a_e_rdb.cpp
+++ b/src/d/actor/d_a_e_rdb.cpp
@@ -252,8 +252,8 @@ static void e_rdb_fight(e_rdb_class* i_this) {
     i_this->field_0x6c8 = 1;
 }
 
-static int getPolyColor(cBgS_PolyInfo& i_polyInfo, int param_2, _GXColor* p_effPrim,
-                        _GXColor* p_effEnv, u8* p_alpha, f32* p_ratio) {
+static int getPolyColor(cBgS_PolyInfo& i_polyInfo, int param_2, GXColor* p_effPrim,
+                        GXColor* p_effEnv, u8* p_alpha, f32* p_ratio) {
     if (dComIfG_Bgsp().ChkPolySafe(i_polyInfo) == 0) {
         return 0;
     }
@@ -301,7 +301,7 @@ static void e_rdb_attack(e_rdb_class* i_this) {
         if (frame == 68) {
             u8 i_alpha;
             f32 i_ratio;
-            _GXColor i_effPrim, i_effEnv;
+            GXColor i_effPrim, i_effEnv;
             if (getPolyColor(i_this->mAcch.m_gnd, 0, &i_effPrim, &i_effEnv, &i_alpha, &i_ratio) !=
                 0)
             {
@@ -395,7 +395,7 @@ static void e_rdb_spin_attack(e_rdb_class* i_this) {
     cLib_addCalc0(&i_this->enemy.speedF, 1.0f, 3.0f);
     u8 i_alpha;
     f32 i_ratio;
-    _GXColor i_effPrim, i_effEnv;
+    GXColor i_effPrim, i_effEnv;
     if (iVar1 != 0 &&
         getPolyColor(i_this->mAcch.m_gnd, 0, &i_effPrim, &i_effEnv, &i_alpha, &i_ratio) != 0)
     {
diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp
index d876993191..065cb8e67e 100644
--- a/src/d/actor/d_a_e_sb.cpp
+++ b/src/d/actor/d_a_e_sb.cpp
@@ -1048,7 +1048,7 @@ int daE_SB_c::Draw() {
     mpMorf->entryDL();
     cXyz my_vec;
     my_vec.set(current.pos.x, 100.0f + current.pos.y, current.pos.z);
-    _GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
+    GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
     mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, &my_vec, 1000.0f, 300.0f,
                                     current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd,
                                     &tevStr, 0, 1.0f, tex_obj);
diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp
index 36f1953709..38cb8ce1ae 100644
--- a/src/d/actor/d_a_e_sg.cpp
+++ b/src/d/actor/d_a_e_sg.cpp
@@ -93,7 +93,7 @@ static int daE_SG_Draw(e_sg_class* i_this) {
         cXyz shadow_pos(i_this->current.pos.x, i_this->current.pos.y + 100.0f,
                         i_this->current.pos.z);
 
-        _GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
+        GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex();
 
         i_this->mShadowKey =
             dComIfGd_setShadow(i_this->mShadowKey, 1, i_this->mpModel, &shadow_pos, 400.0f, 0.0f,
diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp
index 587f091acf..b2f253ad61 100644
--- a/src/d/actor/d_a_e_wb.cpp
+++ b/src/d/actor/d_a_e_wb.cpp
@@ -352,7 +352,7 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) {
 }
 
 static int daE_WB_Draw(e_wb_class* i_this) {
-    static _GXColor l_color = {
+    static GXColor l_color = {
         0x14,
         0x0F,
         0x00,
diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp
index 006851e017..5d8f0027e0 100644
--- a/src/d/actor/d_a_mant.cpp
+++ b/src/d/actor/d_a_mant.cpp
@@ -268,9 +268,9 @@ void daMant_packet_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_CLR_RGB, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0);
 
-    GXSetArray(GX_VA_POS, this->getPos(), 12);
-    GXSetArray(GX_VA_NRM, this->getNrm(), 12);
-    GXSetArray(GX_VA_TEX0, &l_texCoord, 8);
+    GXSETARRAY(GX_VA_POS, this->getPos(), sizeof(mPos[0]), 12);
+    GXSETARRAY(GX_VA_NRM, this->getNrm(), sizeof(mNrm[0]), 12);
+    GXSETARRAY(GX_VA_TEX0, &l_texCoord, sizeof(l_texCoord), 8);
 
     GXSetZCompLoc(0);
     GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE);
diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp
index 1b935a4942..eac1e7e6f1 100644
--- a/src/d/actor/d_a_mg_fish.cpp
+++ b/src/d/actor/d_a_mg_fish.cpp
@@ -678,7 +678,7 @@ s32 daMg_Fish_Draw(mg_fish_class* i_this) {
                 &i_this->actor.tevStr, 0, 1.0f, &dDlst_shadowControl_c::mSimpleTexObj);
         }
         if (i_this->mKind2 == 3) {
-            _GXColor color;
+            GXColor color;
             color.r = 0x32;
             color.g = 0x2d;
             color.b = 0x14;
diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp
index 9907fcc299..2af71470c2 100644
--- a/src/d/actor/d_a_npc4.cpp
+++ b/src/d/actor/d_a_npc4.cpp
@@ -614,7 +614,7 @@ BOOL daNpcF_c::execute() {
     return true;
 }
 
-int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
+int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, GXColorS10* i_fogColor,
                    BOOL i_hideDamage) {
     f32 damage_ratio, frame;
     J3DModel* model = mAnm_p->getModel();
diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp
index 2099c572f1..80beb543f1 100644
--- a/src/d/actor/d_a_npc_chat.cpp
+++ b/src/d/actor/d_a_npc_chat.cpp
@@ -2809,7 +2809,7 @@ int daNpcChat_c::Draw() {
     return 1;
 }
 
-int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
+int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, GXColorS10* i_color, int param_5) {
     J3DModel* model = mAnm_p->getModel();
     J3DModelData* a_mdlData_p = model->getModelData();
 
diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp
index 75a68afda6..33eddd3c07 100644
--- a/src/d/actor/d_a_npc_gwolf.cpp
+++ b/src/d/actor/d_a_npc_gwolf.cpp
@@ -408,7 +408,7 @@ int daNpc_GWolf_c::Draw() {
     );
 }
 
-int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
+int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, GXColorS10* i_color, int param_5) {
     J3DModel* model = mAnm_p->getModel();
     J3DModelData* mdlData_p = model->getModelData();
 
diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp
index 6adc1e99d7..a811e4b326 100644
--- a/src/d/actor/d_a_npc_zrz.cpp
+++ b/src/d/actor/d_a_npc_zrz.cpp
@@ -330,7 +330,7 @@ int daNpc_zrZ_c::Draw() {
     }
 }
 
-int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
+int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, GXColorS10* i_fogColor,
                       int i_hideDamage) {
     f32 damage_ratio, frame;
     J3DModel* model = mAnm_p->getModel();
diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp
index 3f805d7c00..8eb95c1302 100644
--- a/src/d/actor/d_a_obj_flag2.cpp
+++ b/src/d/actor/d_a_obj_flag2.cpp
@@ -274,9 +274,9 @@ void FlagCloth_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_CLR_RGB, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0);
-    GXSetArray(GX_VA_POS, getPos(), sizeof(cXyz));
-    GXSetArray(GX_VA_NRM, getNormal(), sizeof(cXyz));
-    GXSetArray(GX_VA_TEX0, mpTexCoord, 8);
+    GXSETARRAY(GX_VA_POS, getPos(), sizeof(mPositions), sizeof(cXyz));
+    GXSETARRAY(GX_VA_NRM, getNormal(), sizeof(mNormals), sizeof(cXyz));
+    GXSETARRAY(GX_VA_TEX0, mpTexCoord, sizeof(mpTexCoord), 8);
     GXSetZCompLoc(GX_FALSE);
     GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
     GXLoadTexObj(&mTexObj, GX_TEXMAP0);
@@ -304,7 +304,7 @@ void FlagCloth_c::draw() {
     GXSetClipMode(GX_CLIP_ENABLE);
     GXSetCullMode(GX_CULL_BACK);
     GXCallDisplayList(l_pennant_flagDL, 0x80);
-    GXSetArray(GX_VA_NRM, getNormalBack(), sizeof(cXyz));
+    GXSETARRAY(GX_VA_NRM, getNormalBack(), sizeof(mNormalBacks), sizeof(cXyz));
     GXSetCullMode(GX_CULL_FRONT);
     GXCallDisplayList(l_pennant_flagDL, 0x80);
     J3DShape::resetVcdVatCache();
diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp
index 0978924c28..c4431e388b 100644
--- a/src/d/actor/d_a_obj_flag3.cpp
+++ b/src/d/actor/d_a_obj_flag3.cpp
@@ -233,9 +233,9 @@ inline void FlagCloth2_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_CLR_RGB, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0);
-    GXSetArray(GX_VA_POS, getPos(), sizeof(cXyz));
-    GXSetArray(GX_VA_NRM, getNormal(), sizeof(cXyz));
-    GXSetArray(GX_VA_TEX0, mTexCoord, 8);
+    GXSETARRAY(GX_VA_POS, getPos(), sizeof(mPositions), sizeof(cXyz));
+    GXSETARRAY(GX_VA_NRM, getNormal(), sizeof(mNormals), sizeof(cXyz));
+    GXSETARRAY(GX_VA_TEX0, mTexCoord, sizeof(mTexCoord), 8);
     GXSetZCompLoc(GX_FALSE);
     GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
     GXLoadTexObj(&mTexObj, GX_TEXMAP0);
@@ -276,7 +276,7 @@ inline void FlagCloth2_c::draw() {
         GXEnd();
     }
 
-    GXSetArray(GX_VA_NRM, getNormalBack(), sizeof(cXyz));
+    GXSETARRAY(GX_VA_NRM, getNormalBack(), sizeof(mNormalBacks), sizeof(cXyz));
     GXSetCullMode(GX_CULL_FRONT);
 
     for (int i = 0; i < 5; i++) {
diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp
index 2abed0f54b..5168288b3c 100644
--- a/src/d/actor/d_a_obj_kbacket.cpp
+++ b/src/d/actor/d_a_obj_kbacket.cpp
@@ -530,7 +530,7 @@ int daObj_KBacket_c::Draw() {
         } else {
             cM3dGPla plane;
             if (dComIfG_Bgsp().GetTriPla(mGndChk, &plane) != 0) {
-                _GXTexObj* p_Var4 = dDlst_shadowControl_c::getSimpleTex();
+                GXTexObj* p_Var4 = dDlst_shadowControl_c::getSimpleTex();
                 dComIfGd_setSimpleShadow(&current.pos, field_0xa00, 50.0f,
                     &plane.mNormal, 0, 1.0f, p_Var4);
             }
diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp
index 393475d8b7..33c186529b 100644
--- a/src/d/actor/d_a_obj_laundry_rope.cpp
+++ b/src/d/actor/d_a_obj_laundry_rope.cpp
@@ -230,7 +230,7 @@ static int createSolidHeap(fopAc_ac_c* i_this) {
 }
 
 int daObjLndRope_c::draw() {
-    static _GXColor l_color = {20, 15, 0, 255};
+    static GXColor l_color = {20, 15, 0, 255};
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     mRopeMat.update(15, l_color, &tevStr);
     dComIfGd_set3DlineMat(&mRopeMat);
diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp
index 77011548d5..76a2412d91 100644
--- a/src/d/actor/d_a_obj_lp.cpp
+++ b/src/d/actor/d_a_obj_lp.cpp
@@ -18,7 +18,7 @@ static int daObj_Lp_Draw(obj_lp_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     wd_ss* mWdSs = i_this->mWdSs;
     int roomNo = fopAcM_GetRoomNo(a_this);
-    static _GXColor l_color = {
+    static GXColor l_color = {
         0x14,
         0x0A,
         0x0A,
diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp
index 4f5209e7bc..d3ee3f170b 100644
--- a/src/d/actor/d_a_obj_sw.cpp
+++ b/src/d/actor/d_a_obj_sw.cpp
@@ -16,7 +16,7 @@
 #include "m_Do/m_Do_ext.h"
 
 static int daObj_Sw_Draw(obj_sw_class* i_this) {
-    static _GXColor l_color = {
+    static GXColor l_color = {
         0x14,
         0x0F,
         0x00,
diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc
index ccd874c21f..c738c22510 100644
--- a/src/d/actor/d_flower.inc
+++ b/src/d/actor/d_flower.inc
@@ -527,10 +527,10 @@ void dFlower_packet_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetArray(GX_VA_POS, &l_flowerPos, 0xC);
-    GXSetArray(GX_VA_NRM, &l_flowerNormal, 0xC);
-    GXSetArray(GX_VA_CLR0, &l_flowerColor, 4);
-    GXSetArray(GX_VA_TEX0, &l_flowerTexCoord, 8);
+    GXSETARRAY(GX_VA_POS, &l_flowerPos, sizeof(l_flowerPos), 0xC);
+    GXSETARRAY(GX_VA_NRM, &l_flowerNormal, sizeof(l_flowerNormal), 0xC);
+    GXSETARRAY(GX_VA_CLR0, &l_flowerColor, sizeof(l_flowerColor), 4);
+    GXSETARRAY(GX_VA_TEX0, &l_flowerTexCoord, sizeof(l_flowerTexCoord), 8);
 
     GXColor sp64;
     dFlower_room_c* sp5C = m_room;
@@ -622,10 +622,10 @@ void dFlower_packet_c::draw() {
         sp5C++;
     }
 
-    GXSetArray(GX_VA_POS, mp_pos, 0xC);
-    GXSetArray(GX_VA_NRM, &l_flowerNormal2, 0xC);
-    GXSetArray(GX_VA_CLR0, mp_colors, 4);
-    GXSetArray(GX_VA_TEX0, mp_texCoords, 8);
+    GXSETARRAY(GX_VA_POS, mp_pos, sizeof(l_flowerPos2), 0xC);
+    GXSETARRAY(GX_VA_NRM, &l_flowerNormal2, sizeof(l_flowerNormal2), 0xC);
+    GXSETARRAY(GX_VA_CLR0, mp_colors, sizeof(l_flowerColor2), 4);
+    GXSETARRAY(GX_VA_TEX0, mp_texCoords, sizeof(l_flowerTexCoord2), 8);
 
     sp5C = m_room;
 
diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc
index b78ccd8112..5ede524dae 100644
--- a/src/d/actor/d_grass.inc
+++ b/src/d/actor/d_grass.inc
@@ -511,10 +511,10 @@ void dGrass_packet_c::draw() {
 
     GXSetVtxDescv(l_vtxDescList);
     GXSetVtxAttrFmtv(GX_VTXFMT0, l_vtxAttrFmtList);
-    GXSetArray(GX_VA_POS, mp_pos, sizeof(Vec));
-    GXSetArray(GX_VA_NRM, mp_normal, sizeof(Vec));
-    GXSetArray(GX_VA_CLR0, mp_colors, sizeof(GXColor));
-    GXSetArray(GX_VA_TEX0, mp_texCoords, 8);
+    GXSETARRAY(GX_VA_POS, mp_pos, sizeof(l_pos), sizeof(Vec));
+    GXSETARRAY(GX_VA_NRM, mp_normal, sizeof(l_normal), sizeof(Vec));
+    GXSETARRAY(GX_VA_CLR0, mp_colors, sizeof(l_color), sizeof(GXColor));
+    GXSETARRAY(GX_VA_TEX0, mp_texCoords, sizeof(l_texCoord), 8);
 
     GXColorS10 spA0 = {0, 0, 0, 0};
     GXColorS10 sp98 = {0, 0, 0, 0};
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index dbe304a9db..8feb9268a0 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -2256,7 +2256,7 @@ void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) {
 
 int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
                        f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
-                       dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12) {
+                       dKy_tevstr_c* param_9, s16 param_10, f32 param_11, GXTexObj* param_12) {
     if (param_7 <= -G_CM3D_F_INF) {
         return 0;
     } else {
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index b58fa29962..71794623eb 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -964,7 +964,7 @@ void dDlst_effectLine_c::draw() {
     }
 }
 
-void dDlst_effectLine_c::update(cXyz& param_0, _GXColor& i_lineColor, u16 param_2, u16 param_3,
+void dDlst_effectLine_c::update(cXyz& param_0, GXColor& i_lineColor, u16 param_2, u16 param_3,
                                 u16 param_4, u16 param_5, f32 param_6, f32 param_7, f32 param_8,
                                 f32 param_9) {
     field_0x10 = param_0;
@@ -1339,7 +1339,7 @@ void dDlst_shadowSimple_c::draw() {
 }
 
 void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
-                                   s16 param_4, f32 param_5, _GXTexObj* param_6) {
+                                   s16 param_4, f32 param_5, GXTexObj* param_6) {
     if (param_5 < 0.0f) {
         mAlpha = param_5 * -255.0f;
         param_5 = 1.0f;
@@ -1500,7 +1500,7 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
     dKy_GxFog_set();
 
     GXSetChanCtrl(GX_ALPHA0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE);
-    GXSetArray(GX_VA_POS, l_shadowVolPos, 12);
+    GXSETARRAY(GX_VA_POS, l_shadowVolPos, sizeof(l_shadowVolPos), sizeof(l_shadowVolPos[0]));
     GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0);
     GXSetNumTevStages(1);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
@@ -1532,7 +1532,7 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
 
     GXSetTevSwapModeTable(GX_TEV_SWAP0, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0);
-    GXSetArray(GX_VA_POS, l_simpleShadowPos, 12);
+    GXSETARRAY(GX_VA_POS, l_simpleShadowPos, sizeof(l_simpleShadowPos), sizeof(l_simpleShadowPos[0]));
     GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
     GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
     GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp
index f60d159b9e..709c4f8aa1 100644
--- a/src/d/d_map_path.cpp
+++ b/src/d/d_map_path.cpp
@@ -37,7 +37,7 @@ void dMpath_n::dTexObjAggregate_c::remove() {
     }
 }
 
-void dMpath_ColorCnv_n::convertRGB5A3_To_GXColor(_GXColor& color32, const dMpath_RGB5A3_s& color16) {
+void dMpath_ColorCnv_n::convertRGB5A3_To_GXColor(GXColor& color32, const dMpath_RGB5A3_s& color16) {
     int r, g, b, a;
     u16 color = color16.color;
     if (color & 0x8000) {
@@ -295,7 +295,8 @@ void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) {
 void dDrawPath_c::rendering(dDrawPath_c::room_class const* room) {
     JUT_ASSERT(1043, room != NULL);
     if (room != NULL) {
-        GXSetArray(GX_VA_POS, room->mpFloatData, 8);
+        // TODO: FILL IN SIZE.
+        GXSETARRAY(GX_VA_POS, room->mpFloatData, 0, 8);
         floor_class* floor = room->mpFloor;
 
         if (floor != NULL) {
diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp
index 77491eb467..3e587fcce8 100644
--- a/src/d/d_map_path_dmap.cpp
+++ b/src/d/d_map_path_dmap.cpp
@@ -848,7 +848,7 @@ void renderingPlusDoor_c::drawDoorCommon(stage_tgsc_data_class const* i_doorData
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
-    GXSetArray(GX_VA_TEX0, (void*)l_tex0, 2);
+    GXSETARRAY(GX_VA_TEX0, (void*)l_tex0, sizeof(l_tex0), 2);
 
     setTevSettingIntensityTextureToCI();
 
@@ -1007,7 +1007,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() {
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
-    GXSetArray(GX_VA_TEX0, (void*)l_iconTex0, 2);
+    GXSETARRAY(GX_VA_TEX0, (void*)l_iconTex0, sizeof(l_iconTex0), 2);
 
     setTevSettingIntensityTextureToCI();
 
@@ -1081,7 +1081,7 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
-    GXSetArray(GX_VA_TEX0, (void*)l_iconTex0, 2);
+    GXSETARRAY(GX_VA_TEX0, (void*)l_iconTex0, sizeof(l_iconTex0), 2);
 
     setTevSettingIntensityTextureToCI();
 
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp
index edeeda7494..c7354678b1 100644
--- a/src/d/d_particle.cpp
+++ b/src/d/d_particle.cpp
@@ -214,7 +214,7 @@ static void dPa_group_id_change(u32* param_0, u8* param_1) {
     }
 }
 
-static void initiateLighting8(_GXColor& param_0, s16 param_1) {
+static void initiateLighting8(GXColor& param_0, s16 param_1) {
     GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
     GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
     s32 r,g,b;
@@ -246,7 +246,7 @@ static void initiateLighting8(_GXColor& param_0, s16 param_1) {
     GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
 }
 
-static void initiate_b_Lighting8(_GXColor& param_0) {
+static void initiate_b_Lighting8(GXColor& param_0) {
     GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
     GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
     GXSetChanAmbColor(GX_COLOR0A0, param_0);
@@ -804,7 +804,7 @@ JPABaseEmitter* dPa_simpleEcallBack::createEmitter(JPAEmitterManager* param_0) {
 }
 
 u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8 param_3,
-                             _GXColor const& param_4, _GXColor const& param_5, int param_6,
+                             GXColor const& param_4, GXColor const& param_5, int param_6,
                              f32 param_7) {
     f32 fVar1;
     f32 dVar7 = param_7;
@@ -1461,7 +1461,7 @@ void dPa_control_c::setWaterRipple(u32* param_0, cBgS_PolyInfo& param_1, cXyz co
 JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
                                    dKy_tevstr_c const* param_3, csXyz const* i_rotation,
                                    cXyz const* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7,
-                                   s8 param_8, _GXColor const* param_9, _GXColor const* param_10,
+                                   s8 param_8, GXColor const* param_9, GXColor const* param_10,
                                    cXyz const* param_11, f32 param_12) {
     u8 local_e0 = getRM_ID(param_1);
     JPAResourceManager* local_a8 = mEmitterMng->getResourceManager(local_e0);
@@ -1598,8 +1598,8 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
     return this_00;
 }
 
-s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* param_2,
-                                     _GXColor* param_3, u8* param_4, f32* param_5) {
+s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, GXColor* param_2,
+                                     GXColor* param_3, u8* param_4, f32* param_5) {
     if (!dComIfG_Bgsp().ChkPolySafe(param_0)) {
         return 0;
     }
@@ -1656,7 +1656,7 @@ bool dPa_control_c::newSimple(u16 param_0, u8 param_1, u32* param_2) {
 }
 
 u32 dPa_control_c::setSimple(u16 param_0, cXyz const* i_pos, dKy_tevstr_c const* param_2,
-                                  u8 param_3, _GXColor const& param_4, _GXColor const& param_5,
+                                  u8 param_3, GXColor const& param_4, GXColor const& param_5,
                                   int param_6, f32 param_7) {
     dPa_simpleEcallBack* cb = getSimple(param_0);
     if (cb == NULL) {
@@ -1681,7 +1681,7 @@ dPa_simpleEcallBack* dPa_control_c::getSimple(u16 param_0) {
 
 static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
                                     dKy_tevstr_c const* param_2, u32 param_3, cXyz const* param_4,
-                                    _GXColor const* param_5, _GXColor const* param_6) {
+                                    GXColor const* param_5, GXColor const* param_6) {
     f32 fVar1 = param_0;
     if ((param_3 & 0xef0000) >> 0x10 < 100) {
         fVar1 = ((param_3 & 0xef0000) >> 0x10) / 99.0f;
@@ -1725,8 +1725,8 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
 
 u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos,
                        dKy_tevstr_c const* param_4, csXyz const* i_rotation, cXyz const* i_scale,
-                       u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, _GXColor const* param_10,
-                       _GXColor const* param_11, cXyz const* param_12, f32 param_13) {
+                       u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, GXColor const* param_10,
+                       GXColor const* param_11, cXyz const* param_12, f32 param_13) {
     level_c::emitter_c* this_00 = field_0x210.get(param_0);
     u8 uVar7 = getRM_ID(param_2);
     JPAResourceManager* this_01 = mEmitterMng->getResourceManager(uVar7);
diff --git a/src/dusk/stubs.cpp b/src/dusk/stubs.cpp
index 1b76619b40..0d2a8ca550 100644
--- a/src/dusk/stubs.cpp
+++ b/src/dusk/stubs.cpp
@@ -1,5 +1,5 @@
 #include <dolphin/dolphin.h>
-#include <dolphin/gx/GXVert.h>
+#include <dolphin/gx.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -1482,11 +1482,6 @@ void GDSetVtxDescv(const GXVtxDescList* attrPtr) {
 #pragma mark GX
 #include <dolphin/gx.h>
 
-// Dummy FIFO sink for direct GXWGFifo writes in J3D code (e.g. J3DFifo.h).
-// On GameCube these write to the GX command processor at 0xCC008000.
-// On PC, writes land here harmlessly and are discarded.
-volatile PPCWGPipe GXWGFifo;
-
 // GXCmd/GXParam/GXMatrixIndex: low-level command FIFO functions used by J3D.
 // Route through Aurora's software FIFO so display list data is actually recorded.
 //
@@ -1651,7 +1646,7 @@ f32 GXGetYScaleFactor(u16 efbHeight, u16 xfbHeight) {
     return 0.0f;
 }
 
-void GXInitTexCacheRegion(GXTexRegion* region, u8 is_32b_mipmap, u32 tmem_even,
+void GXInitTexCacheRegion(GXTexRegion* region, GXBool is_32b_mipmap, u32 tmem_even,
                           GXTexCacheSize size_even, u32 tmem_odd, GXTexCacheSize size_odd) {
     STUB_LOG("GXInitTexCacheRegion is a stub");
 } 
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 8c68ca1523..f94bcb5ba9 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -2382,8 +2382,8 @@ void mDoExt_3DlineMat0_c::draw() {
     int var_r26 = (field_0x14 << 1) & 0xFFFF;
 
     for (int i = 0; i < field_0x10; i++) {
-        GXSetArray(GX_VA_POS, field_0x18->field_0x8[field_0x16], sizeof(cXyz));
-        GXSetArray(GX_VA_NRM, field_0x18->field_0x10[field_0x16], 3);
+        GXSETARRAY(GX_VA_POS, field_0x18->field_0x8[field_0x16], sizeof(cXyz) * var_r26, sizeof(cXyz));
+        GXSETARRAY(GX_VA_NRM, field_0x18->field_0x10[field_0x16], 3 * var_r26, 3);
 
         GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, var_r26);
         for (u16 j = 0; j < (u16)var_r26; j++) {
@@ -2698,9 +2698,9 @@ void mDoExt_3DlineMat1_c::draw() {
     mDoExt_3Dline_c* lines = mpLines;
     u16 vert_num = field_0x34 << 1;
     for (s32 i = 0; i < mNumLines; i++) {
-        GXSetArray(GX_VA_POS, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x8, 0xC);
-        GXSetArray(GX_VA_NRM, ((mDoExt_3Dline_c*)((intptr_t) lines + (mIsDrawn << 2)))->field_0x10, 0x3);
-        GXSetArray(GX_VA_TEX0, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x18, 0x8);
+        GXSETARRAY(GX_VA_POS, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x8, vert_num * sizeof(cXyz), sizeof(cXyz));
+        GXSETARRAY(GX_VA_NRM, ((mDoExt_3Dline_c*)((intptr_t) lines + (mIsDrawn << 2)))->field_0x10, vert_num * sizeof(mDoExt_3Dline_field_0x10_c), sizeof(mDoExt_3Dline_field_0x10_c));
+        GXSETARRAY(GX_VA_TEX0, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x18, vert_num * sizeof(mDoExt_3Dline_field_0x18_c), sizeof(mDoExt_3Dline_field_0x18_c));
         GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, vert_num);
 
         u16 j = 0;
@@ -2720,7 +2720,7 @@ void mDoExt_3DlineMat1_c::draw() {
     mIsDrawn ^= (u8)1;
 }
 
-void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u16 param_3,
+void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, GXColor& param_2, u16 param_3,
                                      dKy_tevstr_c* param_4) {
     mColor = param_2;
     this->mpTevStr = param_4;
@@ -2888,7 +2888,7 @@ void mDoExt_3DlineMat2_c::setMaterial() {
     GXLoadNrmMtxImm(cMtx_getIdentity(), 0);
 }
 
-void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* param_4) {
+void mDoExt_3DlineMat1_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* param_4) {
     mColor = param_2;
     this->mpTevStr = param_4;
     if (param_0 < 0) {
@@ -3033,7 +3033,7 @@ mDoExt_cube8pPacket::mDoExt_cube8pPacket(cXyz* i_points, const GXColor& i_color)
 }
 
 void drawCube(MtxP mtx, cXyz* pos, const GXColor& color) {
-    GXSetArray(GX_VA_POS, pos, sizeof(cXyz));
+    GXSETARRAY(GX_VA_POS, pos, sizeof(*pos), sizeof(*pos));
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
@@ -3112,7 +3112,7 @@ mDoExt_quadPacket::mDoExt_quadPacket(cXyz* i_points, const GXColor& i_color, u8
 }
 
 void mDoExt_quadPacket::draw() {
-    GXSetArray(GX_VA_POS, mPoints, sizeof(cXyz));
+    GXSETARRAY(GX_VA_POS, mPoints, sizeof(mPoints), sizeof(cXyz));
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
@@ -3164,7 +3164,7 @@ mDoExt_trianglePacket::mDoExt_trianglePacket(cXyz* i_points, const GXColor& i_co
 void mDoExt_trianglePacket::draw() {
     j3dSys.reinitGX();
 
-    GXSetArray(GX_VA_POS, mPoints, sizeof(cXyz));
+    GXSETARRAY(GX_VA_POS, mPoints, sizeof(mPoints), sizeof(cXyz));
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX8);