diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2025-04-09 16:45:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-09 13:45:30 -0700 |
| commit | c6f76e7240dde8bbcf40a88d6d88cf87cab616b4 (patch) | |
| tree | bf9afbb1c32e66f45bdba30f61a9e4f0d92f804a /src/JSystem/J2DGraph/J2DMaterial.cpp | |
| parent | 6672817e41064e04951ec28d51070b66fc8377ac (diff) | |
Various JSystem work (#2383)
* JKernel and JStudio cleanup
* JMessage cleanup
* JAudio cleanup
* JASBNKParser work
* functionvalue work
* fvb work
* J2D and J3D cleanup
* steal from tww
* J2DPictureEx mostly done
* fix build
Diffstat (limited to 'src/JSystem/J2DGraph/J2DMaterial.cpp')
| -rw-r--r-- | src/JSystem/J2DGraph/J2DMaterial.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/JSystem/J2DGraph/J2DMaterial.cpp b/src/JSystem/J2DGraph/J2DMaterial.cpp index ea9712dff8..3b7165967d 100644 --- a/src/JSystem/J2DGraph/J2DMaterial.cpp +++ b/src/JSystem/J2DGraph/J2DMaterial.cpp @@ -8,7 +8,6 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTTexture.h" -#include "dol2asm.h" /* 802EA1AC-802EA2CC 2E4AEC 0120+00 0/0 1/1 0/0 .text __ct__11J2DMaterialFv */ J2DMaterial::J2DMaterial() { @@ -305,17 +304,17 @@ void J2DMaterial::animation() { ResTIMG* img = mAnmPointer->mPatternAnm->getResTIMG(idx); if (texture->getTexInfo() != img) { JUTPalette* palette = NULL; - u32 tlut = GX_TLUT0; + GXTlut tlut = GX_TLUT0; if (img->indexTexture != 0) { palette = mAnmPointer->mPatternAnm->getPalette(idx); if (palette->getNumColors() > 256) { - tlut = i % 4 + 16; + tlut = (GXTlut)(i % 4 + 16); } else { - tlut = i; + tlut = (GXTlut)i; } } - texture->storeTIMG(img, palette, (GXTlut)tlut); + texture->storeTIMG(img, palette, tlut); } } } |