From d3e00cadccb20566b9a4239b398ec9aad33c8f91 Mon Sep 17 00:00:00 2001 From: PokeCodec Date: Fri, 14 Aug 2020 18:08:16 -0400 Subject: [PATCH] Enum Time --- gflib/text.c | 10 +++++----- gflib/text.h | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gflib/text.c b/gflib/text.c index 5722d5a43..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; @@ -482,8 +482,8 @@ u8 GetLastTextColor(u8 colorType) 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; \ diff --git a/gflib/text.h b/gflib/text.h index 0d0f3341d..0829d748f 100644 --- a/gflib/text.h +++ b/gflib/text.h @@ -269,6 +269,13 @@ #define TEXT_SPEED_FF 0xFF +enum +{ + COLOR_FOREGROUND, + COLOR_SHADOW, + COLOR_BACKGROUND +}; + enum { FONTATTR_MAX_LETTER_WIDTH,