summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-03-27 15:51:45 +0100
committerrobojumper <robojumper@gmail.com>2025-03-27 15:51:45 +0100
commite8d9aae33e779f6aee484eedc7d1a1df8307edb5 (patch)
tree510573a24c3206cc1051c3e69f8d93c9ce3601ba
parent811e7746780f14a4d26e351d592c79b52072e4df (diff)
Minor fixes
-rw-r--r--config/SOUE01/splits.txt1
-rw-r--r--src/egg/gfx/eggCpuTexture.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index 6b35f7f4..021f9266 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -2264,6 +2264,7 @@ egg/gfx/eggLightObject.cpp:
.text start:0x804A9810 end:0x804AB24C
.rodata start:0x804FBC88 end:0x804FBC98
.data start:0x8056F098 end:0x8056F0B8
+ .sdata start:0x80574F30 end:0x80574F38
.sdata2 start:0x8057F690 end:0x8057F6C0
egg/gfx/eggLightTexture.cpp:
diff --git a/src/egg/gfx/eggCpuTexture.cpp b/src/egg/gfx/eggCpuTexture.cpp
index f5b925c9..955641a4 100644
--- a/src/egg/gfx/eggCpuTexture.cpp
+++ b/src/egg/gfx/eggCpuTexture.cpp
@@ -290,7 +290,7 @@ void CpuTexture::setColor(u16 x, u16 y, GXColor color) {
case GX_TF_I8:
case GX_TF_Z8: {
// TODO
- int offset = ((x >> 3) + (y >> 2) * (getWidth() / 8)) * 0x20 + (x & 3) * 8 + (x & 7);
+ int offset = ((x >> 3) + (y >> 2) * (getWidth() / 8)) * 0x20 + (y & 3) * 8 + (x & 7);
u8 *dat = static_cast<u8 *>(getBuffer()) + offset;
dat[0] = color.r;
break;
@@ -325,7 +325,7 @@ GXColor CpuTexture::getColor(u16 x, u16 y) const {
case GX_TF_I8:
case GX_TF_Z8: {
// TODO
- int offset = ((x >> 3) + (y >> 2) * (getWidth() / 8)) * 0x20 + (x & 3) * 8 + (x & 7);
+ int offset = ((x >> 3) + (y >> 2) * (getWidth() / 8)) * 0x20 + (y & 3) * 8 + (x & 7);
u8 *dat = static_cast<u8 *>(getBuffer()) + offset;
c.a = dat[0];
c.b = dat[0];