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

2 files changed, 9 insertions, 13 deletions

diff --git a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
index 29fdeccd5c..35f960d888 100644
--- a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
@@ -97,8 +97,7 @@ J3DDrawBuffer::~J3DDrawBuffer() {
     mpBuf = NULL;
 }
 
-#if NON_MATCHING
-
+#ifdef NONMATCHING
 /* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text            frameInit__13J3DDrawBufferFv */
 void J3DDrawBuffer::frameInit() {
     // can't make mwcc not generate "mtctr" for this loop
@@ -107,9 +106,7 @@ void J3DDrawBuffer::frameInit() {
 
     mpCallBackPacket = NULL;
 }
-
 #else
-
 /* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text            frameInit__13J3DDrawBufferFv */
 #pragma push
 #pragma optimization_level 0
@@ -119,7 +116,6 @@ asm void J3DDrawBuffer::frameInit() {
 #include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/frameInit__13J3DDrawBufferFv.s"
 }
 #pragma pop
-
 #endif
 
 /* 8032509C-803251E4 31F9DC 0148+00 2/1 0/0 0/0 .text
diff --git a/libs/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/J3DGraphBase/J3DTexture.cpp
index 634f17fc5d..cf575daf32 100644
--- a/libs/JSystem/J3DGraphBase/J3DTexture.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DTexture.cpp
@@ -12,18 +12,18 @@ void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const {
     ResTIMG* timg = getResTIMG(idx);
     GXTexObj texObj;
 
-    if (!timg->palettesEnabled) {
-        GXInitTexObj(&texObj, ((u8*)timg) + timg->texDataOffset, timg->width, timg->height,
+    if (!timg->indexTexture) {
+        GXInitTexObj(&texObj, ((u8*)timg) + timg->imageOffset, timg->width, timg->height,
                      (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT,
                      (GXBool)timg->mipmapEnabled);
     } else {
         GXTlutObj tlutObj;
 
-        GXInitTexObjCI(&texObj, ((u8*)timg) + timg->texDataOffset, timg->width, timg->height,
+        GXInitTexObjCI(&texObj, ((u8*)timg) + timg->imageOffset, timg->width, timg->height,
                        (GXCITexFmt)timg->format, (GXTexWrapMode)timg->wrapS,
                        (GXTexWrapMode)timg->wrapT, (GXBool)timg->mipmapEnabled, (u32)texMapID);
-        GXInitTlutObj(&tlutObj, ((u8*)timg) + timg->paletteOffset, (GXTlutFmt)timg->paletteFormat,
-                      timg->paletteCount);
+        GXInitTlutObj(&tlutObj, ((u8*)timg) + timg->paletteOffset, (GXTlutFmt)timg->colorFormat,
+                      timg->numColors);
         GXLoadTlut(&tlutObj, texMapID);
     }
 
@@ -43,7 +43,7 @@ void J3DTexture::entryNum(u16 num) {
 
     for (s32 i = 0; i < mNum; i++) {
         mpRes[i].paletteOffset = 0;
-        mpRes[i].texDataOffset = 0;
+        mpRes[i].imageOffset = 0;
     }
 }
 
@@ -59,13 +59,13 @@ void J3DTexture::addResTIMG(u16 newNum, ResTIMG const* newRes) {
 
     for (u16 i = 0; i < oldNum; i++) {
         mpRes[i] = oldRes[i];
-        mpRes[i].texDataOffset = (u32)(&oldRes[i]) + mpRes[i].texDataOffset - (u32)(&mpRes[i]);
+        mpRes[i].imageOffset = (u32)(&oldRes[i]) + mpRes[i].imageOffset - (u32)(&mpRes[i]);
         mpRes[i].paletteOffset = (u32)(&oldRes[i]) + mpRes[i].paletteOffset - (u32)(&mpRes[i]);
     }
 
     for (u16 i = oldNum; i < mNum; i++) {
         mpRes[i] = newRes[i];
-        mpRes[i].texDataOffset = (u32)(&newRes[i]) + mpRes[i].texDataOffset - (u32)(&mpRes[i]);
+        mpRes[i].imageOffset = (u32)(&newRes[i]) + mpRes[i].imageOffset - (u32)(&mpRes[i]);
         mpRes[i].paletteOffset = (u32)(&newRes[i]) + mpRes[i].paletteOffset - (u32)(&mpRes[i]);
     }
 }