Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen

1 files changed, 9 insertions, 1 deletions

diff --git a/include/gba/defines.h b/include/gba/defines.h
index 8c92d7b64..9e822358a 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -73,10 +73,18 @@
 #define TOTAL_OBJ_TILE_COUNT 1024
 
 #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_WHITEALPHA (0xFFFF)
+#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 NAKED __attribute__((naked))
 #define UNUSED __attribute__((unused))