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

diff --git a/src/data.h b/src/data.h
index e805f63..0021ef9 100644
--- a/src/data.h
+++ b/src/data.h
@@ -8,6 +8,7 @@
 	(((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)
 
@@ -24,14 +25,37 @@ enum {
 	SPRID_LEDRED	= SPRID(40, 16),
 	SPRID_LEDBLU	= SPRID(48, 16),
 	SPRID_LEDGRN	= SPRID(56, 16),
-	SPRID_ENEMY		= SPRID(0, 64)
+	/*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_ */