From cdcd6beb2926dfd7e4df2a0daf32c38c9c07b229 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Mon, 2 Mar 2026 21:40:50 +0100 Subject: [PATCH] Fix ResTIMG BE everywhere --- .../include/JSystem/JUtility/JUTTexture.h | 16 +++++++-------- libs/JSystem/src/JUtility/JUTTexture.cpp | 20 +++++++++---------- src/m_Do/m_Do_graphic.cpp | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libs/JSystem/include/JSystem/JUtility/JUTTexture.h b/libs/JSystem/include/JSystem/JUtility/JUTTexture.h index 8911467439..fbda4296e5 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTTexture.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTTexture.h @@ -19,14 +19,14 @@ class JUTPalette; struct ResTIMG { /* 0x00 */ u8 format; /* 0x01 */ u8 alphaEnabled; - /* 0x02 */ u16 width; - /* 0x04 */ u16 height; + /* 0x02 */ BE(u16) width; + /* 0x04 */ BE(u16) height; /* 0x06 */ u8 wrapS; /* 0x07 */ u8 wrapT; /* 0x08 */ u8 indexTexture; /* 0x09 */ u8 colorFormat; - /* 0x0A */ u16 numColors; - /* 0x0C */ u32 paletteOffset; + /* 0x0A */ BE(u16) numColors; + /* 0x0C */ BE(u32) paletteOffset; /* 0x10 */ u8 mipmapEnabled; /* 0x11 */ u8 doEdgeLOD; /* 0x12 */ u8 biasClamp; @@ -37,8 +37,8 @@ struct ResTIMG { /* 0x17 */ s8 maxLOD; /* 0x18 */ u8 mipmapCount; /* 0x19 */ u8 unknown; - /* 0x1A */ s16 LODBias; - /* 0x1C */ u32 imageOffset; + /* 0x1A */ BE(s16) LODBias; + /* 0x1C */ BE(u32) imageOffset; }; // Size: 0x20 /** @@ -72,8 +72,8 @@ public: const ResTIMG* getTexInfo() const { return mTexInfo; } s32 getFormat() const { return mTexInfo->format; } s32 getTransparency() const { return mTexInfo->alphaEnabled; } - s32 getWidth() const { return RES_U16(mTexInfo->width); } - s32 getHeight() const { return RES_U16(mTexInfo->height); } + s32 getWidth() const { return mTexInfo->width; } + s32 getHeight() const { return mTexInfo->height; } void setCaptureFlag(bool flag) { mFlags &= 2 | flag; } bool getCaptureFlag() const { return mFlags & 1; } bool getEmbPaletteDelFlag() const { return mFlags & 2; } diff --git a/libs/JSystem/src/JUtility/JUTTexture.cpp b/libs/JSystem/src/JUtility/JUTTexture.cpp index 880895c880..d0f08381e6 100644 --- a/libs/JSystem/src/JUtility/JUTTexture.cpp +++ b/libs/JSystem/src/JUtility/JUTTexture.cpp @@ -17,7 +17,7 @@ JUTTexture::~JUTTexture() { void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { if (param_0 && param_1 < 0x10) { mTexInfo = param_0; - u32 imgOffset = RES_U32(mTexInfo->imageOffset); + u32 imgOffset = mTexInfo->imageOffset; mTexData = (void*)((intptr_t)mTexInfo + imgOffset); if (mTexInfo->imageOffset == 0) { @@ -32,9 +32,9 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { mMagFilter = mTexInfo->magFilter; mMinLOD = (s8)mTexInfo->minLOD; mMaxLOD = (s8)mTexInfo->maxLOD; - mLODBias = RES_S16(mTexInfo->LODBias); + mLODBias = mTexInfo->LODBias; - u16 numColors = RES_U16(mTexInfo->numColors); + u16 numColors = mTexInfo->numColors; if (numColors == 0) { initTexObj(); @@ -46,7 +46,7 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { tlut = (GXTlut)param_1; } - u32 palOffset = RES_U32(mTexInfo->paletteOffset); + u32 palOffset = mTexInfo->paletteOffset; if (mEmbPalette == NULL || !getEmbPaletteDelFlag()) { mEmbPalette = new JUTPalette(tlut, (GXTlutFmt)mTexInfo->colorFormat, @@ -142,13 +142,13 @@ void JUTTexture::init() { void JUTTexture::initTexObj() { GXBool mipmapEnabled = mTexInfo->mipmapEnabled != 0 ? GX_TRUE : GX_FALSE; u8* image = ((u8*)mTexInfo); - u32 imgOffset = RES_U32(mTexInfo->imageOffset); + u32 imgOffset = mTexInfo->imageOffset; image += (imgOffset ? imgOffset : 0x20); - GXInitTexObj(&mTexObj, image, RES_U16(mTexInfo->width), RES_U16(mTexInfo->height), + GXInitTexObj(&mTexObj, image, mTexInfo->width, mTexInfo->height, (GXTexFmt)mTexInfo->format, (GXTexWrapMode)mWrapS, (GXTexWrapMode)mWrapT, mipmapEnabled); GXInitTexObjLOD(&mTexObj, (GXTexFilter)mMinFilter, (GXTexFilter)mMagFilter, mMinLOD / 8.0f, - mMaxLOD / 8.0f, RES_S16(mLODBias) / 100.0f, mTexInfo->biasClamp, + mMaxLOD / 8.0f, mLODBias / 100.0f, mTexInfo->biasClamp, mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy); } @@ -156,16 +156,16 @@ void JUTTexture::initTexObj(GXTlut param_0) { GXBool mipmapEnabled = mTexInfo->mipmapEnabled != 0 ? GX_TRUE : GX_FALSE; mTlutName = param_0; u8* image = ((u8*)mTexInfo); - u32 imgOffset = RES_U32(mTexInfo->imageOffset); // Swap! + u32 imgOffset = mTexInfo->imageOffset; printf("[DIAG] initTexObj: Offset=%u, W=%u, H=%u, Ptr=%p\n", imgOffset, mTexInfo->width, mTexInfo->height, mTexInfo); image += (imgOffset ? imgOffset : 0x20); - GXInitTexObjCI(&mTexObj, image, RES_U16(mTexInfo->width), RES_U16(mTexInfo->height), + GXInitTexObjCI(&mTexObj, image, mTexInfo->width, mTexInfo->height, (GXCITexFmt)mTexInfo->format, (GXTexWrapMode)mWrapS, (GXTexWrapMode)mWrapT, mipmapEnabled, param_0); GXInitTexObjLOD(&mTexObj, (GXTexFilter)mMinFilter, (GXTexFilter)mMagFilter, mMinLOD / 8.0f, - mMaxLOD / 8.0f, RES_S16(mLODBias) / 100.0f, mTexInfo->biasClamp, + mMaxLOD / 8.0f, mLODBias / 100.0f, mTexInfo->biasClamp, mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy); } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 778b937c9e..eb41c7dfd5 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -246,12 +246,12 @@ static ResTIMG* createTimg(u16 width, u16 height, u32 format) { cLib_memSet(timg, 0, bufferSize); timg->format = format; timg->alphaEnabled = false; - timg->width = RES_U16(width); - timg->height = RES_U16(height); + timg->width = width; + timg->height = height; timg->minFilter = GX_LINEAR; timg->magFilter = GX_LINEAR; timg->mipmapCount = 1; - timg->imageOffset = RES_U32(0x20); + timg->imageOffset = 0x20; return timg; }