diff options
Diffstat (limited to 'src/JSystem/J2DGraph')
| -rw-r--r-- | src/JSystem/J2DGraph/J2DMaterialFactory.cpp | 10 | ||||
| -rw-r--r-- | src/JSystem/J2DGraph/J2DTevs.cpp | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 8e430601b9..024adef56f 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -270,18 +270,8 @@ J2DTevOrder J2DMaterialFactory::newTevOrder(int param_0, int param_1) const { } J2DGXColorS10 J2DMaterialFactory::newTevColor(int param_0, int param_1) const { - // FAKEMATCH - #if DEBUG || VERSION == VERSION_WII_USA_R0 || VERSION == VERSION_WII_USA_R2 GXColorS10 color = {0, 0, 0, 0}; J2DGXColorS10 rv = color; - #else - GXColorS10 color = {0, 0, 0, 0}; - J2DGXColorS10 rv; - rv.r = color.r; - rv.g = color.g; - rv.b = color.b; - rv.a = color.a; - #endif J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]]; if (iVar2->field_0x92[param_1] != 0xffff) { diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index 51c8027ff9..703046a687 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -149,6 +149,6 @@ extern const u8 j2dDefaultPEBlockDither = 0; extern const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0}; -extern const u8 data_804561AC = 0x1B; +extern const u8 j2dDefaultTevSwapTableID = 0x1B; extern const u16 j2dDefaultAlphaCmp = 0x00E7; |