From fe85419fd37d5a63e2e334defa9d1ce732dbccd6 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 11 Oct 2023 00:32:49 -0700
Subject: [PATCH] JPATexture match

---
 configure.py                           |  2 +-
 include/JSystem/JParticle/JPATexture.h | 19 +++++++++----------
 include/JSystem/JUtility/JUTTexture.h  |  1 -
 src/JSystem/JParticle/JPATexture.cpp   |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/configure.py b/configure.py
index b432e1572..bf142005d 100644
--- a/configure.py
+++ b/configure.py
@@ -565,7 +565,7 @@ config.libs = [
             Object(NonMatching, "JSystem/JParticle/JPADynamicsBlock.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAFieldBlock.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAKeyBlock.cpp"),
-            Object(NonMatching, "JSystem/JParticle/JPATexture.cpp"),
+            Object(Matching,    "JSystem/JParticle/JPATexture.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAResourceManager.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAEmitterLoader.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAMath.cpp"),
diff --git a/include/JSystem/JParticle/JPATexture.h b/include/JSystem/JParticle/JPATexture.h
index 33e9ed2c4..5093f8716 100644
--- a/include/JSystem/JParticle/JPATexture.h
+++ b/include/JSystem/JParticle/JPATexture.h
@@ -16,24 +16,23 @@ struct JPATextureData {
 
 class JPATexture {
 public:
-    virtual ~JPATexture();
-    virtual const char* getName() const;
-    virtual void load(GXTexMapID);
-    virtual JUTTexture* getJUTTexture();
-
-    JUTTexture mTexture;
+    virtual ~JPATexture() {}
+    virtual const char* getName() const = 0;
+    virtual void load(GXTexMapID) = 0;
+    virtual JUTTexture* getJUTTexture() = 0;
 };
 
 class JPATextureArc : public JPATexture {
 public:
     JPATextureArc(u8 const*);
-    virtual ~JPATextureArc();
+    virtual ~JPATextureArc() {}
 
-    const char* getName() const { return mpData->mName; }
-    void load(GXTexMapID texMapID) { mTexture.load(texMapID); }
-    JUTTexture* getJUTTexture() { return &mTexture; }
+    virtual const char* getName() const { return mpData->mName; }
+    virtual void load(GXTexMapID texMapID) { mTexture.load(texMapID); }
+    virtual JUTTexture* getJUTTexture() { return &mTexture; }
 
 public:
+    JUTTexture mTexture;
     const JPATextureData* mpData;
 };
 
diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h
index 40629f5e5..b118139af 100644
--- a/include/JSystem/JUtility/JUTTexture.h
+++ b/include/JSystem/JUtility/JUTTexture.h
@@ -41,7 +41,6 @@ public:
     JUTTexture() {
         setCaptureFlag(false);
         mEmbPalette = NULL;
-        mTexInfo = NULL;
     }
 
     JUTTexture(const ResTIMG* p_timg, u8 param_1) {
diff --git a/src/JSystem/JParticle/JPATexture.cpp b/src/JSystem/JParticle/JPATexture.cpp
index a58cf24a6..1ee86221e 100644
--- a/src/JSystem/JParticle/JPATexture.cpp
+++ b/src/JSystem/JParticle/JPATexture.cpp
@@ -9,7 +9,7 @@
 #include "dolphin/types.h"
 
 /* 80258660-802586D0       .text __ct__13JPATextureArcFPCUc */
-JPATextureArc::JPATextureArc(const unsigned char * pData) {
+JPATextureArc::JPATextureArc(const u8 * pData) {
     mpData = (JPATextureData *) pData;
     mTexture.storeTIMG(&mpData->mResTIMG, (unsigned char)'\0');
 }