ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1137 from PokeCodec/glyphREMATCH

Browse Source 
Create Enum for Colors
This commit is contained in:
GriffinR 2020-08-14 23:59:44 -04:00 committed by GitHub
commit 98e68a8112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gflib/text.c
View File

@ -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; \

7
gflib/text.h
View File

@ -269,6 +269,13 @@
#define TEXT_SPEED_FF 0xFF
enum
{
COLOR_FOREGROUND,
COLOR_SHADOW,
COLOR_BACKGROUND
};
enum
{
FONTATTR_MAX_LETTER_WIDTH,