diff options
Diffstat (limited to 'gflib/text.c')
| -rw-r--r-- | gflib/text.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gflib/text.c b/gflib/text.c index d46ac7c0e..07fd23109 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -451,11 +451,11 @@ u8 GetLastTextColor(u8 colorType) { switch (colorType) { - case 0: + case COLOR_FOREGROUND: return gLastTextFgColor; - case 2: + case COLOR_BACKGROUND: return gLastTextBgColor; - case 1: + case COLOR_SHADOW: return gLastTextShadowColor; default: return 0; @@ -475,15 +475,15 @@ u8 GetLastTextColor(u8 colorType) \ for (; i < toY; i++) \ { \ - asm("":::"sl"); \ + asm("":::"sl"); \ r5 = *(ptr++); \ for (j = fromX; j < toX; j++) \ { \ const u32 toOrr = r5 & 0xF; \ if (toOrr) \ { \ - dst = windowTiles + ((j >> 3) * 32) + ((j & 7) >> 1) + ((i >> 3) * widthOffset) + ((i & 7) * 4); \ - bits = ((j & 1) << 2); \ + dst = windowTiles + ((j / 8) * 32) + ((j & 7) >> 1) + ((i / 8) * widthOffset) + ((i & 7) * 4); \ + bits = ((j & 1) * 4); \ *dst = (toOrr << bits) | ((0xF0 >> bits) & *dst); \ } \ r5 >>= 4; \ |