Merge branch 'master' of https://github.com/pret/pokeemerald into menu

2018-02-07 18:06:59 -06:00
parent 5db765a475 48e63979c8
commit 772fd47564
385 changed files with 26738 additions and 46633 deletions
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -63,11 +63,6 @@

 #define TOTAL_OBJ_TILE_COUNT 1024

-#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
-
-#define RGB_BLACK RGB(0, 0, 0)
-#define RGB_WHITE RGB(31, 31, 31)
-
 #define WIN_RANGE(a, b) (((a) << 8) | (b))

 #endif // GUARD_GBA_DEFINES