From e620f9328b305ad947d8185fc46fb95210df1fa1 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Tue, 14 Jan 2025 22:47:21 -0500
Subject: [PATCH] Use _GX name typedefs

---
 include/JSystem/J3DGraphBase/J3DGD.h          | 2 +-
 include/JSystem/J3DGraphBase/J3DTexture.h     | 2 +-
 include/JSystem/JFramework/JFWDisplay.h       | 6 +++---
 include/JSystem/JParticle/JPADraw.h           | 2 +-
 include/JSystem/JUtility/JUTCacheFont.h       | 2 +-
 include/JSystem/JUtility/JUTException.h       | 2 +-
 include/JSystem/JUtility/JUTPalette.h         | 6 +++---
 include/JSystem/JUtility/JUTResFont.h         | 6 +++---
 include/JSystem/JUtility/JUTTexture.h         | 2 +-
 include/JSystem/JUtility/JUTVideo.h           | 2 +-
 include/JSystem/JUtility/JUTXfb.h             | 2 +-
 src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 2 +-
 src/JSystem/JFramework/JFWDisplay.cpp         | 6 +++---
 src/JSystem/JUtility/JUTPalette.cpp           | 2 +-
 src/JSystem/JUtility/JUTResFont.cpp           | 4 ++--
 src/JSystem/JUtility/JUTTexture.cpp           | 4 ++--
 src/JSystem/JUtility/JUTXfb.cpp               | 4 ++--
 src/d/actor/d_a_obj_leaves.cpp                | 2 +-
 src/d/d_map.cpp                               | 8 ++++----
 src/d/d_menu_cloth.cpp                        | 2 +-
 src/d/d_particle.cpp                          | 4 ++--
 21 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h
index 4b76ae099..d16094f5d 100644
--- a/include/JSystem/J3DGraphBase/J3DGD.h
+++ b/include/JSystem/J3DGraphBase/J3DGD.h
@@ -53,7 +53,7 @@ inline void J3DGXCmd1f32ptr(f32* value) {
     GXFIFO.u32 = *(u32*)value;
 }
 
-void J3DGDSetGenMode(u8 texGenNum, u8 colorChanNum, u8 tevStageNum, u8 IndTexStageNum, _GXCullMode cullMode);
+void J3DGDSetGenMode(u8 texGenNum, u8 colorChanNum, u8 tevStageNum, u8 IndTexStageNum, GXCullMode cullMode);
 void J3DGDSetGenMode_3Param(u8 texGenNum, u8 tevStageNum, u8 indTexStageNum);
 void J3DGDSetIndTexStageNum(u32);
 void J3DGDSetLightAttn(GXLightID, f32, f32, f32, f32, f32, f32);
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 9956ed3ec..31ed73a5b 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -37,7 +37,7 @@ public:
     J3DTexture(u16 num, ResTIMG* res) : mNum(num), mpRes(res) {}
     virtual ~J3DTexture() {}
 
-    void loadGX(u16, _GXTexMapID) const;
+    void loadGX(u16, GXTexMapID) const;
     void entryNum(u16);
     void addResTIMG(u16, ResTIMG const*);
 
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index bcaabc838..f60fd7d3a 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -40,8 +40,8 @@ public:
         /* 0x1 */ Async = 1,
     };
 
-    void ctor_subroutine(const _GXRenderModeObj*, bool enableAlpha);
-    JFWDisplay(const _GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber, bool);
+    void ctor_subroutine(const GXRenderModeObj*, bool enableAlpha);
+    JFWDisplay(const GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber, bool);
     static JFWDisplay* createManager(JKRHeap*, JUTXfb::EXfbNumber, bool);
     void prepareCopyDisp();
     void drawendXfb_single();
@@ -103,7 +103,7 @@ public:
 
 private:
     /* 0x04 */ JUTFader* mpFader;
-    /* 0x08 */ const _GXRenderModeObj* mpRenderMode;
+    /* 0x08 */ const GXRenderModeObj* mpRenderMode;
     /* 0x0C */ JUtility::TColor mClearColor;
     /* 0x10 */ u32 mZClear;
     /* 0x14 */ JUTXfb* mXfbManager;
diff --git a/include/JSystem/JParticle/JPADraw.h b/include/JSystem/JParticle/JPADraw.h
index 90742e4b2..3185fe2a2 100644
--- a/include/JSystem/JParticle/JPADraw.h
+++ b/include/JSystem/JParticle/JPADraw.h
@@ -55,7 +55,7 @@ public:
     void calcChild(JPABaseParticle*);
     void initParticle(JPABaseParticle*);
     void initChild(JPABaseParticle*, JPABaseParticle*);
-    bool loadTexture(u8, _GXTexMapID);
+    bool loadTexture(u8, GXTexMapID);
     void setDrawExecVisitorsBeforeCB(const JPADraw::JPADrawVisitorDefFlags&);
     void setDrawExecVisitorsAfterCB(const JPADraw::JPADrawVisitorDefFlags&);
     void setDrawCalcVisitors(const JPADraw::JPADrawVisitorDefFlags&);
diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h
index c86e0d0f5..5d72910e1 100644
--- a/include/JSystem/JUtility/JUTCacheFont.h
+++ b/include/JSystem/JUtility/JUTCacheFont.h
@@ -49,7 +49,7 @@ public:
     void prepend(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 7dc79cc9c..20bdb1408 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -17,7 +17,7 @@ public:
     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/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h
index 7a53b52b2..bb5cccb8b 100644
--- a/include/JSystem/JUtility/JUTPalette.h
+++ b/include/JSystem/JUtility/JUTPalette.h
@@ -14,14 +14,14 @@ struct ResTLUT {
 
 class JUTPalette {
 public:
-    JUTPalette(GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) {
+    JUTPalette(GXTlut p1, GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) {
         this->storeTLUT(p1, p2, p3, p4, p5);
     }
 
     JUTPalette(GXTlut tlutNo, ResTLUT* p_tlutRes) { storeTLUT(tlutNo, p_tlutRes); }
 
     void storeTLUT(GXTlut, ResTLUT*);
-    void storeTLUT(GXTlut, _GXTlutFmt, JUTTransparency, u16, void*);
+    void storeTLUT(GXTlut, GXTlutFmt, JUTTransparency, u16, void*);
     bool load();
 
     u8 getTlutName() const { return mTlutName; }
@@ -31,7 +31,7 @@ public:
     ResTLUT* getColorTable() const { return mColorTable; }
 
 private:
-    /* 0x00 */ _GXTlutObj mTlutObj;
+    /* 0x00 */ GXTlutObj mTlutObj;
     /* 0x0C */ u8 mTlutName;
     /* 0x0D */ u8 mFormat;
     /* 0x10 */ ResTLUT* mColorTable;
diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h
index 2bef93605..77047933b 100644
--- a/include/JSystem/JUtility/JUTResFont.h
+++ b/include/JSystem/JUtility/JUTResFont.h
@@ -25,7 +25,7 @@ public:
     virtual int getCellWidth() const;
     virtual s32 getCellHeight() const;
     virtual bool isLeadByte(int) const;
-    virtual void loadImage(int, _GXTexMapID);
+    virtual void loadImage(int, GXTexMapID);
     virtual void setBlock();
 
     JUTResFont(ResFONT const*, JKRHeap*);
@@ -35,7 +35,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, u16*) const;
 
@@ -49,7 +49,7 @@ public:
 
     /* 0x1C */ int mWidth;
     /* 0x20 */ int mHeight;
-    /* 0x24 */ _GXTexObj mTexObj;
+    /* 0x24 */ GXTexObj mTexObj;
     /* 0x44 */ int mTexPageIdx;
     /* 0x48 */ const ResFONT* mResFont;
     /* 0x4C */ ResFONT::INF1* mInfoBlock;
diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h
index 81d3d19f2..992485c98 100644
--- a/include/JSystem/JUtility/JUTTexture.h
+++ b/include/JSystem/JUtility/JUTTexture.h
@@ -50,7 +50,7 @@ public:
     }
 
     ~JUTTexture();
-    void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut);
+    void storeTIMG(ResTIMG const*, JUTPalette*, GXTlut);
     void storeTIMG(ResTIMG const*, u8);
     void storeTIMG(ResTIMG const*, JUTPalette*);
     void attachPalette(JUTPalette*);
diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h
index a4d5a37fd..03683d4d2 100644
--- a/include/JSystem/JUtility/JUTVideo.h
+++ b/include/JSystem/JUtility/JUTVideo.h
@@ -51,7 +51,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 5627ca514..054a4ca3b 100644
--- a/include/JSystem/JUtility/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb.h
@@ -19,7 +19,7 @@ public:
     JUTXfb(GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber);
     ~JUTXfb();
     void delXfb(int);
-    static JUTXfb* createManager(const _GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber);
+    static JUTXfb* createManager(const GXRenderModeObj*, JKRHeap*, JUTXfb::EXfbNumber);
     static void destroyManager();
     void initiate(u16, u16, JKRHeap*, JUTXfb::EXfbNumber);
 
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index d18839bfb..10e8fd592 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -293,7 +293,7 @@ void J3DModelLoader::readVertex(const J3DVertexBlock* i_block) {
             JSUConvertOffsetToPtr<void>(i_block, i_block->mpVtxTexCoordArray[i]);
     }
 
-    _GXCompType nrm_type = getFmtType(vertex_data.mVtxAttrFmtList, GX_VA_NRM);
+    GXCompType nrm_type = getFmtType(vertex_data.mVtxAttrFmtList, GX_VA_NRM);
     u32 nrm_size = nrm_type == GX_F32 ? 12 : 6;
 
     void* nrm_end = NULL;
diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp
index 6262d9a0e..de0423c3d 100644
--- a/src/JSystem/JFramework/JFWDisplay.cpp
+++ b/src/JSystem/JFramework/JFWDisplay.cpp
@@ -31,7 +31,7 @@ u8 clear_z_TX[64] ALIGN_DECL(32) = {
 
 
 /* 802551C0-8025527C       .text ctor_subroutine__10JFWDisplayFPC16_GXRenderModeObjb */
-void JFWDisplay::ctor_subroutine(const _GXRenderModeObj* mode, bool enableAlpha) {
+void JFWDisplay::ctor_subroutine(const GXRenderModeObj* mode, bool enableAlpha) {
     mEnableAlpha = enableAlpha;
     mClamp = 3;
 
@@ -61,7 +61,7 @@ void JFWDisplay::ctor_subroutine(const _GXRenderModeObj* mode, bool enableAlpha)
 }
 
 /* 8025527C-802552EC       .text __ct__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb */
-JFWDisplay::JFWDisplay(const _GXRenderModeObj* mode, JKRHeap* p_heap, JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
+JFWDisplay::JFWDisplay(const GXRenderModeObj* mode, JKRHeap* p_heap, JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
     ctor_subroutine(mode, enableAlpha);
     mXfbManager = JUTXfb::createManager(mode, p_heap, xfb_num);
 }
@@ -96,7 +96,7 @@ void callDirectDraw() {
 
 /* 80255444-80255528       .text prepareCopyDisp__10JFWDisplayFv */
 void JFWDisplay::prepareCopyDisp() {
-    _GXRenderModeObj* renderObj = JUTVideo::getManager()->getRenderMode();
+    GXRenderModeObj* renderObj = JUTVideo::getManager()->getRenderMode();
     u16 width, height;
     JUTVideo::getManager()->getBounds(width, height);
     u16 xfb_height = JUTVideo::getManager()->getXfbHeight();
diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/src/JSystem/JUtility/JUTPalette.cpp
index c65c613e9..3b54a4c5b 100644
--- a/src/JSystem/JUtility/JUTPalette.cpp
+++ b/src/JSystem/JUtility/JUTPalette.cpp
@@ -14,7 +14,7 @@ void JUTPalette::storeTLUT(GXTlut param_0, ResTLUT* tlut) {
     GXInitTlutObj(&mTlutObj, (void*)mColorTable, (GXTlutFmt)mFormat, mNumColors);
 }
 
-void JUTPalette::storeTLUT(GXTlut param_0, _GXTlutFmt param_1, JUTTransparency param_2,
+void JUTPalette::storeTLUT(GXTlut param_0, GXTlutFmt param_1, JUTTransparency param_2,
                            u16 param_3, void* param_4) {
     mTlutName = param_0;
     mFormat = param_1;
diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp
index f63f0aae2..a938f4c55 100644
--- a/src/JSystem/JUtility/JUTResFont.cpp
+++ b/src/JSystem/JUtility/JUTResFont.cpp
@@ -282,7 +282,7 @@ f32 JUTResFont::drawChar_scale(f32 posX, f32 posY, f32 scaleX, f32 scaleY, int c
 }
 
 /* 802C2D6C-802C2DE8       .text loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth */
-void JUTResFont::loadFont(int code, _GXTexMapID texMapID, JUTFont::TWidth* pDstWidth) {
+void JUTResFont::loadFont(int code, GXTexMapID texMapID, JUTFont::TWidth* pDstWidth) {
     if (pDstWidth) {
         getWidthEntry(code, pDstWidth);
     }
@@ -397,7 +397,7 @@ int JUTResFont::getFontCode(int chr) const {
 }
 
 /* 802C30E4-802C3248       .text loadImage__10JUTResFontFi11_GXTexMapID */
-void JUTResFont::loadImage(int code, _GXTexMapID id) {
+void JUTResFont::loadImage(int code, GXTexMapID id) {
     int i = 0;
     for (; i < mGlyphBlockNum; i++) {
         if (mpGlyphBlocks[i]->startCode <= code && code <= mpGlyphBlocks[i]->endCode) {
diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp
index 3c223bfeb..5eee2bfe7 100644
--- a/src/JSystem/JUtility/JUTTexture.cpp
+++ b/src/JSystem/JUtility/JUTTexture.cpp
@@ -20,7 +20,7 @@ JUTTexture::~JUTTexture() {
 
 /* 802C1470-802C15FC       .text storeTIMG__10JUTTextureFPC7ResTIMGUc */
 void JUTTexture::storeTIMG(const ResTIMG* pTimg, u8 param_1) {
-    _GXTlut tlut;
+    GXTlut tlut;
 
     if (pTimg && param_1 < 0x10) {
         mTexInfo = pTimg;
@@ -71,7 +71,7 @@ void JUTTexture::attachPalette(JUTPalette* pPalette) {
         } else {
             mAttachedPalette = pPalette;
         }
-        _GXTlut name = (GXTlut)mAttachedPalette->getTlutName();
+        GXTlut name = (GXTlut)mAttachedPalette->getTlutName();
         initTexObj(name);
     }
 }
diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp
index 36c1f57b9..469db037e 100644
--- a/src/JSystem/JUtility/JUTXfb.cpp
+++ b/src/JSystem/JUtility/JUTXfb.cpp
@@ -25,7 +25,7 @@ void JUTXfb::common_init(int bufNum) {
 }
 
 /* 802C8224-802C82CC       .text __ct__6JUTXfbFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumber */
-JUTXfb::JUTXfb(const _GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
+JUTXfb::JUTXfb(const GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
     common_init(xfbNum);
 
     if (pObj) {
@@ -62,7 +62,7 @@ void JUTXfb::delXfb(int xfbIdx) {
 }
 
 /* 802C837C-802C8410       .text createManager__6JUTXfbFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumber */
-JUTXfb* JUTXfb::createManager(const _GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
+JUTXfb* JUTXfb::createManager(const GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
     JUT_CONFIRM(VERSION_SELECT(198, 203, 203), sManager == 0);
     if (sManager == NULL) {
         sManager = new JUTXfb(pObj, pHeap, xfbNum);
diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp
index 54d537b51..554c93e45 100644
--- a/src/d/actor/d_a_obj_leaves.cpp
+++ b/src/d/actor/d_a_obj_leaves.cpp
@@ -20,7 +20,7 @@ void daObjLeaves_c::init_mtx() {
 }
 
 /* 00000148-000002E4       .text birthEffect__13daObjLeaves_cFiP4cXyzP5csXyzP8_GXColor */
-void daObjLeaves_c::birthEffect(int, cXyz*, csXyz*, _GXColor*) {
+void daObjLeaves_c::birthEffect(int, cXyz*, csXyz*, GXColor*) {
     /* Nonmatching */
 }
 
diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp
index f11fdf816..ace909fb7 100644
--- a/src/d/d_map.cpp
+++ b/src/d/d_map.cpp
@@ -708,7 +708,7 @@ void dMap_RoomInfoCtrl_c::checkFloorMoveImageChangeRoom(u8, u8, int, s16, s16, f
 }
 
 /* 8004DA54-8004DBE0       .text init__22dMap_2DMtMapSpcl_tex_cFP7ResTIMGUlRC8_GXColor */
-void dMap_2DMtMapSpcl_tex_c::init(ResTIMG*, u32, const _GXColor&) {
+void dMap_2DMtMapSpcl_tex_c::init(ResTIMG*, u32, const GXColor&) {
     /* Nonmatching */
 }
 
@@ -773,7 +773,7 @@ void dMap_2DAGBScrDsp_c::setScale(f32, f32) {
 }
 
 /* 8004EE50-8004EE88       .text init__12dMap_2DTri_cFssRC8_GXColorffs */
-void dMap_2DTri_c::init(s16, s16, const _GXColor&, f32, f32, s16) {
+void dMap_2DTri_c::init(s16, s16, const GXColor&, f32, f32, s16) {
     /* Nonmatching */
 }
 
@@ -788,7 +788,7 @@ void dMap_2DTri_c::setPos(s16, s16) {
 }
 
 /* 8004F08C-8004F0BC       .text init__14dMap_2DPoint_cFssRC8_GXColorUc */
-void dMap_2DPoint_c::init(s16, s16, const _GXColor&, u8) {
+void dMap_2DPoint_c::init(s16, s16, const GXColor&, u8) {
     /* Nonmatching */
 }
 
@@ -798,7 +798,7 @@ void dMap_2DPoint_c::draw() {
 }
 
 /* 8004F1E4-8004F214       .text init__18dMap_2DAGBCursor_cFssRC8_GXColorUc */
-void dMap_2DAGBCursor_c::init(s16, s16, const _GXColor&, u8) {
+void dMap_2DAGBCursor_c::init(s16, s16, const GXColor&, u8) {
     /* Nonmatching */
 }
 
diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp
index 367a92134..e5ada460e 100644
--- a/src/d/d_menu_cloth.cpp
+++ b/src/d/d_menu_cloth.cpp
@@ -101,7 +101,7 @@ void dMCloth_c::ShadowTevSetting() {
 }
 
 /* 8019ADD4-8019B670       .text draw__9dMCloth_cFf8_GXColor8_GXColorUc */
-void dMCloth_c::draw(float, _GXColor, _GXColor, unsigned char) {
+void dMCloth_c::draw(float, GXColor, GXColor, unsigned char) {
     /* Nonmatching */
 }
 
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp
index 1da76a0e1..b1e14d2f4 100644
--- a/src/d/d_particle.cpp
+++ b/src/d/d_particle.cpp
@@ -304,7 +304,7 @@ dPa_smokeEcallBack::dPa_smokeEcallBack(u8 param_1, u8 param_2, u8 param_3, u8 pa
 }
 
 /* 8007B558-8007B5E8       .text __ct__18dPa_smokeEcallBackFRC8_GXColorP12dKy_tevstr_cUc */
-dPa_smokeEcallBack::dPa_smokeEcallBack(const _GXColor& param_1, dKy_tevstr_c* param_2, u8 param_3) {
+dPa_smokeEcallBack::dPa_smokeEcallBack(const GXColor& param_1, dKy_tevstr_c* param_2, u8 param_3) {
     field_0x16 = param_1;
     mTevstr = param_2;
     mRateOff = param_3;
@@ -880,7 +880,7 @@ bool dPa_control_c::newSimple(u16 param_1, u8 param_2) {
 }
 
 /* 8007DBC4-8007DC30       .text setSimple__13dPa_control_cFUsPC4cXyzUcRC8_GXColorRC8_GXColori */
-bool dPa_control_c::setSimple(u16 param_1, const cXyz* param_2, u8 param_3, const _GXColor& param_4, const _GXColor& param_5, int param_6) {
+bool dPa_control_c::setSimple(u16 param_1, const cXyz* param_2, u8 param_3, const GXColor& param_4, const GXColor& param_5, int param_6) {
     dPa_simpleEcallBack* simple = getSimple(param_1);
     if (simple == NULL) {
         return false;