added logo splash screen

[gbajam22] / src / util.h

diff --git a/src/util.h b/src/util.h
index 2e5f013..6902d64 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -5,6 +5,9 @@
 #include <stdint.h>
 #include "gba.h"
 
+#define RGB555(r, g, b)        \
+       (((r) >> 3) | (((g) << 2) & 0x3e0) | (((b) << 7) & 0x7c00))
+
 #ifdef BUILD_GBA
 
 #define wait_vblank() \
@@ -15,7 +18,7 @@
 
 #define present(x) \
        do { \
-               REG_DISPCNT = DISPCNT_BG2 | DISPCNT_OBJ | 4 | ((x) << 4); \
+               REG_DISPCNT = (REG_DISPCNT & 0xffef) | ((x) << 4); \
        } while(0)
 
 #define ARM_IWRAM      __attribute__((noinline, target("arm"), section(".iwram")))