X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Futil.h;h=264367be94a4082ad3f544e99e01f025334f8175;hb=fb23aa4804a46173f817eb83b4823b7263ef0ed9;hp=3bbafbd75771e9001be00f240a2a79eabef4dfaa;hpb=b0f9c6ecc15c2d4b5df77a7a963b742a6352ee1a;p=gbajam22

diff --git a/src/util.h b/src/util.h
index 3bbafbd..264367b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -5,6 +5,11 @@
 #include <stdint.h>
 #include "gba.h"
 
+#define RGB555(r, g, b)	\
+	((((uint16_t)(r) >> 3) & 0x1f) | \
+	 (((uint16_t)(g) << 2) & 0x3e0) | \
+	 (((uint16_t)(b) << 7) & 0x7c00))
+
 #ifdef BUILD_GBA
 
 #define wait_vblank() \
@@ -15,13 +20,17 @@
 
 #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")))
+
 #else	/* non-GBA build */
 #define wait_vblank()
 
 void present(int buf);		/* defined in src/pc/main.c */
+
+#define ARM_IWRAM
 #endif
 
 #define set_bg_color(idx, r, g, b) \
@@ -29,8 +38,14 @@ void present(int buf);		/* defined in src/pc/main.c */
 
 extern int16_t sinlut[];
 
-#define SIN(x)	sinlut[(x) & 0xff]
-#define COS(x)	sinlut[((x) + 64) & 0xff]
+#define SINLUT_BITS		8
+#define SINLUT_SIZE		(1 << SINLUT_BITS)
+
+#define SIN(angle) \
+	((int32_t)sinlut[((angle) >> (16 - SINLUT_BITS)) & (SINLUT_SIZE - 1)] << 1)
+
+#define COS(angle) \
+	((int32_t)sinlut[(((angle) >> (16 - SINLUT_BITS)) + (SINLUT_SIZE / 4)) & (SINLUT_SIZE - 1)] << 1)
 
 int iwram_brk(void *addr);
 void *iwram_sbrk(intptr_t delta);