X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpc%2Fmain.c;h=c61066dfb5d14c79103df7e8921b8be10685de4b;hb=09ff9fd9a87d495d8c2d55203af89d0f651b5d3a;hp=cf6ffec1dee2c1852a4bdc17fe96c5cb200ba589;hpb=79c636931d1f9bf844196e91be171b17bbe9c04f;p=gbajam22

diff --git a/src/pc/main.c b/src/pc/main.c
index cf6ffec..c61066d 100644
--- a/src/pc/main.c
+++ b/src/pc/main.c
@@ -130,15 +130,15 @@ uint16_t get_input(void)
 #define PACK_RGB32(r, g, b) \
 	((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff) | 0xff000000)
 
-#define UNPACK_R16(c)	(((c) >> 9) & 0xf8)
-#define UNPACK_G16(c)	(((c) >> 3) & 0xf8)
-#define UNPACK_B16(c)	(((c) << 3) & 0xf8)
+#define UNPACK_R16(c)	(((c) << 3) & 0xf8)
+#define UNPACK_G16(c)	(((c) >> 2) & 0xf8)
+#define UNPACK_B16(c)	(((c) >> 7) & 0xf8)
 
 void present(int buf)
 {
 	int i, npix = 240 * 160;
 	uint32_t *dptr = convbuf;
-	uint8_t *sptr = buf ? gba_vram_lfb1 : gba_vram_lfb0;
+	uint8_t *sptr = (uint8_t*)(buf ? gba_vram_lfb1 : gba_vram_lfb0);
 
 	for(i=0; i<npix; i++) {
 		int idx = *sptr++;