Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps

1 files changed, 13 insertions, 10 deletions

diff --git a/include/constants/rgb.h b/include/constants/rgb.h
index 1896250d2..be3049d3c 100644
--- a/include/constants/rgb.h
+++ b/include/constants/rgb.h
@@ -5,18 +5,21 @@
 #define GET_G(color) (((color) >> 5) & 0x1F)
 #define GET_B(color) (((color) >> 10) & 0x1F)
 
-#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
+#define RGB(r, g, b)  ((r) | ((g) << 5) | ((b) << 10))
 #define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
 #define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F))
 
-#define RGB_BLACK RGB(0, 0, 0)
-#define RGB_WHITE RGB(31, 31, 31)
-#define RGB_RED RGB(31, 0, 0)
-#define RGB_GREEN RGB(0, 31, 0)
-#define RGB_BLUE RGB(0, 0, 31)
-#define RGB_YELLOW RGB(31, 31, 0)
-#define RGB_MAGENTA RGB(31, 0, 31)
-#define RGB_CYAN RGB(0, 31, 31)
-#define RGB_WHITEALPHA (RGB_WHITE | 0x8000)
+#define RGB_ALPHA       (1 << 15)
+#define IS_ALPHA(color) ((color) & RGB_ALPHA)
+
+#define RGB_BLACK      RGB(0, 0, 0)
+#define RGB_WHITE      RGB(31, 31, 31)
+#define RGB_RED        RGB(31, 0, 0)
+#define RGB_GREEN      RGB(0, 31, 0)
+#define RGB_BLUE       RGB(0, 0, 31)
+#define RGB_YELLOW     RGB(31, 31, 0)
+#define RGB_MAGENTA    RGB(31, 0, 31)
+#define RGB_CYAN       RGB(0, 31, 31)
+#define RGB_WHITEALPHA (RGB_WHITE | RGB_ALPHA)
 
 #endif // GUARD_RGB_H