d_camera / m_Do_ext / d_particle + minor various wip (#210)

2 files changed, 7 insertions, 7 deletions

diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp
index 25a2baa7f5..717ce664cf 100644
--- a/libs/JSystem/J2DGraph/J2DAnimation.cpp
+++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp
@@ -568,10 +568,10 @@ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) {
                     }
                 }
                 mTIMGPtrArray[i].mRes = var2;
-                if (var2 != NULL && var2->palettesEnabled) {
+                if (var2 != NULL && var2->indexTexture) {
                     JUTPalette* palette =
-                        new JUTPalette(GX_TLUT0, (_GXTlutFmt)var2->paletteFormat,
-                                       (JUTTransparency)var2->alphaEnabled, var2->paletteCount,
+                        new JUTPalette(GX_TLUT0, (_GXTlutFmt)var2->colorFormat,
+                                       (JUTTransparency)var2->alphaEnabled, var2->numColors,
                                        ((u8*)var2) + var2->paletteOffset);
                     mTIMGPtrArray[i].mPalette = palette;
                 }
diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
index 1b7f72b98a..8585bfcd17 100644
--- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp
+++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
@@ -1108,9 +1108,9 @@ bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
     }
 
     u8 tlutid = 0;
-    if (p_timg->palettesEnabled && p_tlut == NULL) {
+    if (p_timg->indexTexture && p_tlut == NULL) {
         JUTTexture* tex = mTexture[0];
-        if (tex != NULL && tex->getTexInfo() != NULL && tex->getTexInfo()->palettesEnabled) {
+        if (tex != NULL && tex->getTexInfo() != NULL && tex->getTexInfo()->indexTexture) {
             int tlutname = tex->getTlutName();
             if (tlutname == GX_TLUT0 || tlutname == GX_BIGTLUT0) {
                 tlutid = 1;
@@ -1235,10 +1235,10 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
     }
 
     u8 tlutid = 0;
-    if (p_timg != NULL && p_timg->palettesEnabled) {
+    if (p_timg != NULL && p_timg->indexTexture) {
         if (mTexture[param_0 == 0] != NULL) {
             const ResTIMG* timg = mTexture[param_0 == 0]->getTexInfo();
-            if (timg != NULL && timg->palettesEnabled) {
+            if (timg != NULL && timg->indexTexture) {
                 int tlutname = mTexture[param_0 == 0]->getTlutName();
                 u8 var_r0 = 0;