X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdata.h;h=0021ef93bdc2e0a77fcdc7c0a993620cfc11c595;hb=09ff9fd9a87d495d8c2d55203af89d0f651b5d3a;hp=06e7123947bc9f3b2446b47fbccaac514f085af5;hpb=a40ea78e8bd2fc5ba01906fd19bedf074203a24a;p=gbajam22

diff --git a/src/data.h b/src/data.h
index 06e7123..0021ef9 100644
--- a/src/data.h
+++ b/src/data.h
@@ -8,27 +8,54 @@
 	(((r) >> 3) | (((uint16_t)(g) & 0xf8) << 2) | (((uint16_t)(b) & 0xf8) << 7))
 
 #define VOX_SZ	512
+#define CMAP_SPAWN0	240
+
+#define SPRID(x, y)		(SPRID_BASE + ((y) * 4) + (x) / 4)
 
 enum {
 	SPRID_BASE		= 512,
-	SPRID_UILEFT	= SPRID_BASE + 0,
-	SPRID_UIMID		= SPRID_BASE + 4,
-	SPRID_UIRIGHT	= SPRID_BASE + 8,
-	SPRID_UINUM		= SPRID_BASE + 12,
-	SPRID_UISLASH	= SPRID_BASE + 94,
-	SPRID_CROSS		= SPRID_BASE + 64,
-	SPRID_UITGT		= SPRID_BASE + 68,
-	SPRID_LEDOFF	= SPRID_BASE + 72,
-	SPRID_LEDRED	= SPRID_BASE + 74,
-	SPRID_LEDBLU	= SPRID_BASE + 76,
-	SPRID_LEDGRN	= SPRID_BASE + 78
+	SPRID_UILEFT	= SPRID(0, 0),
+	SPRID_UIMID		= SPRID(16, 0),
+	SPRID_UIRIGHT	= SPRID(32, 0),
+	SPRID_UINUM		= SPRID(48, 0),
+	SPRID_UISLASH	= SPRID(120, 16),
+	SPRID_CROSS		= SPRID(0, 16),
+	SPRID_UITGT		= SPRID(16, 16),
+	SPRID_LEDOFF	= SPRID(32, 16),
+	SPRID_LEDRED	= SPRID(40, 16),
+	SPRID_LEDBLU	= SPRID(48, 16),
+	SPRID_LEDGRN	= SPRID(56, 16),
+	/*SPRID_ENEMY		= SPRID(0, 64)*/
+	SPRID_ENEMY0	= SPRID(0, 32),
+	SPRID_HUSK		= SPRID(112, 64),
+	SPRID_LAS0		= SPRID(0, 64),
+	SPRID_LAS1		= SPRID(32, 64),
+	SPRID_LAS2		= SPRID(64, 64),
+	SPRID_LAS3		= SPRID(0, 96),
+	SPRID_SPARK0	= SPRID(32, 96),
+	SPRID_SHOT0		= SPRID(64, 16),
+	SPRID_SHOT1		= SPRID(80, 16),
+	SPRID_SHOT2		= SPRID(96, 16)
 };
 
+/* main game data */
 extern unsigned char color_pixels[];
 extern unsigned char color_cmap[];
+extern unsigned char color_gba_cmap[];
 extern unsigned char height_pixels[];
 
 extern unsigned char spr_game_pixels[];
 extern unsigned char spr_game_cmap[];
 
+/* menu screen assets */
+extern unsigned char menuscr_pixels[];
+extern unsigned char menuscr_cmap[];
+extern unsigned char menuscr_gba_cmap[];
+extern unsigned char spr_menu_pixels[];
+extern unsigned char spr_menu_cmap[];
+
+/* logo splash assets */
+extern unsigned char spr_logo_pixels[];
+extern unsigned char spr_logo_cmap[];
+
 #endif	/* DATA_H_ */