merge overworld with master

2018-02-15 12:41:32 +01:00
parent 4b4495f3fe fcf3f97da9
commit 90fa97f810
26 changed files with 2235 additions and 5957 deletions
--- a/include/constants/rgb.h
+++ b/include/constants/rgb.h
@@ -12,5 +12,6 @@
 #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

 #endif // GUARD_RGB_H