add health and power sprites, unfinished.

src/main.c

@@ -30,7 +30,6 @@
 #include "sprites.h"
 #include "sound.h"
 
-// The metasprite will be built starting with hardware sprite zero (the first)
 #define SPR_NUM_START 0
 
 static uint8_t joyp = 0;
@@ -53,19 +52,27 @@ enum ACCELERATION {
 static void splash(void) {
     disable_interrupts();
     DISPLAY_OFF;
-
-    set_default_palette();
     map_title();
-
     SHOW_BKG;
+    SHOW_SPRITES;
+    SPRITES_8x8;
     DISPLAY_ON;
     enable_interrupts();
 
+    obj_init();
+    obj_add(SPR_LIGHT, 42, -42, 0, 0);
+    obj_add(SPR_DARK, -42, -42, 0, 0);
+
     while(1) {
         KEY_INPUT;
         if (KEY_DOWN(0xFF)) {
             break;
         }
+
+        uint8_t hiwater = SPR_NUM_START;
+        obj_draw(0, 0, &hiwater);
+        hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
+
         vsync();
     }
 }
@@ -73,16 +80,8 @@ static void splash(void) {
 static void game(void) {
     disable_interrupts();
     DISPLAY_OFF;
-
-    set_default_palette();
     map_game();
-
     SHOW_BKG;
-
-    spr_init();
-    obj_init();
-    snd_init();
-
     SHOW_SPRITES;
     SPRITES_8x8;
     DISPLAY_ON;
@@ -96,6 +95,8 @@ static void game(void) {
     enum ACCELERATION prev_acc = 0xFF; // so we draw the ship on the first frame
     uint8_t ship_hiwater = 0;
 
+    obj_init();
+
     // TODO remove
     obj_add(SPR_LIGHT, 64, 64, 0, 0);
     obj_add(SPR_DARK, -64, -64, 0, 0);
@@ -187,6 +188,16 @@ static void game(void) {
         }
 
         obj_draw(SpdX, SpdY, &hiwater);
+
+        spr_draw(SPR_HEALTH, FLIP_NONE, -80 + 8, -32, &hiwater);
+        spr_draw(SPR_HEALTH, FLIP_NONE, -80 + 8, -24, &hiwater);
+        spr_draw(SPR_HEALTH, FLIP_NONE, -80 + 8, -16, &hiwater);
+        spr_draw(SPR_HEALTH, FLIP_NONE, -80 + 8, -8, &hiwater);
+        spr_draw(SPR_POWER, FLIP_NONE, -80 + 8, 32, &hiwater);
+        spr_draw(SPR_POWER, FLIP_NONE, -80 + 8, 24, &hiwater);
+        spr_draw(SPR_POWER, FLIP_NONE, -80 + 8, 16, &hiwater);
+        spr_draw(SPR_POWER, FLIP_NONE, -80 + 8, 8, &hiwater);
+
         hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
 
         prev_acc = acc;
@@ -196,6 +207,9 @@ static void game(void) {
 }
 
 void main(void) {
+    spr_init();
+    snd_init();
+
 #ifndef DEBUG
     splash();
 #endif // DEBUG

src/obj.c

@@ -73,12 +73,18 @@ void obj_draw(int16_t spd_x, int16_t spd_y, uint8_t *hiwater) {
             continue;
         }
 
-        spr_draw(objs[i].sprite, hiwater, FLIP_NONE, objs[i].off_x >> 4, objs[i].off_y >> 4);
+        spr_draw(objs[i].sprite, FLIP_NONE, objs[i].off_x >> 4, objs[i].off_y >> 4, hiwater);
 
+        // move objects by their speed and compensate for movement of the background / ship
         objs[i].off_x += objs[i].spd_x - spd_x;
         objs[i].off_y += objs[i].spd_y - spd_y;
 
-        objs[i].travel += 1;
+        // only update travel time if we're actually moving
+        if ((objs[i].spd_x != 0) || (objs[i].spd_y != 0)) {
+            objs[i].travel += 1;
+        }
+
+        // remove objects that have traveled for too long
         if (objs[i].travel >= MAX_TRAVEL) {
             objs[i].active = 0;
         }

src/sprites.c

@@ -32,6 +32,8 @@
 #include "light.h"
 #include "dark.h"
 #include "shoot.h"
+#include "health.h"
+#include "power.h"
 
 // Metasprite tiles are loaded into VRAM starting at tile number 0
 #define TILE_NUM_START 0
@@ -40,6 +42,7 @@ struct sprites {
     const metasprite_t * const * ms;
     const uint8_t * ti;
     const palette_color_t * pa;
+    uint8_t pa_i;
     uint8_t cnt;
     uint8_t off;
 };
@@ -49,64 +52,87 @@ static struct sprites metasprites[SPRITE_COUNT] = {
         .ms = rockshp_0_metasprites,
         .ti = rockshp_0_tiles,
         .pa = rockshp_0_palettes,
+        .pa_i = OAMF_CGB_PAL0,
         .cnt = rockshp_0_TILE_COUNT,
         .off = TILE_NUM_START
     }, {
         .ms = rockshp_90_metasprites,
         .ti = rockshp_90_tiles,
-        .pa = rockshp_90_palettes,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL0,
         .cnt = rockshp_90_TILE_COUNT,
         .off = TILE_NUM_START
     }, {
         .ms = thrust_0_metasprites,
         .ti = thrust_0_tiles,
         .pa = thrust_0_palettes,
+        .pa_i = OAMF_CGB_PAL1,
         .cnt = thrust_0_TILE_COUNT,
         .off = TILE_NUM_START
     }, {
         .ms = thrust_90_metasprites,
         .ti = thrust_90_tiles,
-        .pa = thrust_90_palettes,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL1,
         .cnt = thrust_90_TILE_COUNT,
         .off = TILE_NUM_START
     }, {
         .ms = light_metasprites,
         .ti = light_tiles,
         .pa = light_palettes,
+        .pa_i = OAMF_CGB_PAL2,
         .cnt = light_TILE_COUNT,
         .off = TILE_NUM_START
     }, {
         .ms = dark_metasprites,
         .ti = dark_tiles,
         .pa = dark_palettes,
+        .pa_i = OAMF_CGB_PAL3,
         .cnt = dark_TILE_COUNT,
         .off = TILE_NUM_START
     }, {
         .ms = shoot_metasprites,
         .ti = shoot_tiles,
         .pa = shoot_palettes,
+        .pa_i = OAMF_CGB_PAL4,
         .cnt = shoot_TILE_COUNT,
         .off = TILE_NUM_START
+    }, {
+        .ms = health_metasprites,
+        .ti = health_tiles,
+        .pa = health_palettes, // RGB8(239,  0,  0), RGB8(204,  0,  0), RGB8(167,  1,  0), RGB8(116,  0,  0)
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = health_TILE_COUNT,
+        .off = TILE_NUM_START
+    }, {
+        .ms = power_metasprites,
+        .ti = power_tiles,
+        .pa = power_palettes, // RGB8(  0,236,  0), RGB8(  2,193,  1), RGB8(  5,152,  0), RGB8(  3, 98,  0)
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = power_TILE_COUNT,
+        .off = TILE_NUM_START
     }
 };
 
 void spr_init(void) {
     uint8_t off = TILE_NUM_START;
-    for (int i = 0; i < (sizeof(metasprites) / sizeof(metasprites[0])); i++) {
+    for (uint8_t i = 0; i < SPRITE_COUNT; i++) {
         metasprites[i].off = off;
         off += metasprites[i].cnt;
 
-        set_sprite_palette(OAMF_CGB_PAL0 + i, 1, metasprites[i].pa);
+        if (metasprites[i].pa != NULL) {
+            set_sprite_palette(metasprites[i].pa_i, 1, metasprites[i].pa);
+        }
         set_sprite_data(metasprites[i].off, metasprites[i].cnt, metasprites[i].ti);
     }
 }
 
-void spr_draw(enum SPRITES sprite, uint8_t *hiwater, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off) {
+void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off, uint8_t *hiwater) {
     switch (flip) {
         case FLIP_Y:
             *hiwater += move_metasprite_flipy(
                     metasprites[sprite].ms[0], metasprites[sprite].off,
-                    OAMF_CGB_PAL0 + sprite, *hiwater,
+                    metasprites[sprite].pa_i, *hiwater,
                     DEVICE_SPRITE_PX_OFFSET_X + (DEVICE_SCREEN_PX_WIDTH / 2) + x_off,
                     DEVICE_SPRITE_PX_OFFSET_Y + (DEVICE_SCREEN_PX_HEIGHT / 2) + y_off);
             break;
@@ -114,7 +140,7 @@ void spr_draw(enum SPRITES sprite, uint8_t *hiwater, enum SPRITE_FLIP flip, int8
         case FLIP_XY:
             *hiwater += move_metasprite_flipxy(
                     metasprites[sprite].ms[0], metasprites[sprite].off,
-                    OAMF_CGB_PAL0 + sprite, *hiwater,
+                    metasprites[sprite].pa_i, *hiwater,
                     DEVICE_SPRITE_PX_OFFSET_X + (DEVICE_SCREEN_PX_WIDTH / 2) + x_off,
                     DEVICE_SPRITE_PX_OFFSET_Y + (DEVICE_SCREEN_PX_HEIGHT / 2) + y_off);
             break;
@@ -122,7 +148,7 @@ void spr_draw(enum SPRITES sprite, uint8_t *hiwater, enum SPRITE_FLIP flip, int8
         case FLIP_X:
             *hiwater += move_metasprite_flipx(
                     metasprites[sprite].ms[0], metasprites[sprite].off,
-                    OAMF_CGB_PAL0 + sprite, *hiwater,
+                    metasprites[sprite].pa_i, *hiwater,
                     DEVICE_SPRITE_PX_OFFSET_X + (DEVICE_SCREEN_PX_WIDTH / 2) + x_off,
                     DEVICE_SPRITE_PX_OFFSET_Y + (DEVICE_SCREEN_PX_HEIGHT / 2) + y_off);
             break;
@@ -131,7 +157,7 @@ void spr_draw(enum SPRITES sprite, uint8_t *hiwater, enum SPRITE_FLIP flip, int8
         default:
             *hiwater += move_metasprite_ex(
                     metasprites[sprite].ms[0], metasprites[sprite].off,
-                    OAMF_CGB_PAL0 + sprite, *hiwater,
+                    metasprites[sprite].pa_i, *hiwater,
                     DEVICE_SPRITE_PX_OFFSET_X + (DEVICE_SCREEN_PX_WIDTH / 2) + x_off,
                     DEVICE_SPRITE_PX_OFFSET_Y + (DEVICE_SCREEN_PX_HEIGHT / 2) + y_off);
             break;
@@ -141,30 +167,30 @@ void spr_draw(enum SPRITES sprite, uint8_t *hiwater, enum SPRITE_FLIP flip, int8
 void spr_ship(enum SPRITE_ROT rot, uint8_t moving, uint8_t *hiwater) {
     switch (rot) {
         case ROT_0:
-            spr_draw(SPR_SHIP_0, hiwater, FLIP_NONE, 0, 0);
+            spr_draw(SPR_SHIP_0, FLIP_NONE, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_0, hiwater, FLIP_NONE, 0, SHIP_OFF);
+                spr_draw(SPR_THRUST_0, FLIP_NONE, 0, SHIP_OFF, hiwater);
             }
             break;
 
         case ROT_90:
-            spr_draw(SPR_SHIP_90, hiwater, FLIP_NONE, 0, 0);
+            spr_draw(SPR_SHIP_90, FLIP_NONE, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_90, hiwater, FLIP_NONE, -SHIP_OFF, 0);
+                spr_draw(SPR_THRUST_90, FLIP_NONE, -SHIP_OFF, 0, hiwater);
             }
             break;
 
         case ROT_180:
-            spr_draw(SPR_SHIP_0, hiwater, FLIP_Y, 0, 0);
+            spr_draw(SPR_SHIP_0, FLIP_Y, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_0, hiwater, FLIP_Y, 0, -SHIP_OFF);
+                spr_draw(SPR_THRUST_0, FLIP_Y, 0, -SHIP_OFF, hiwater);
             }
             break;
 
         case ROT_270:
-            spr_draw(SPR_SHIP_90, hiwater, FLIP_X, 0, 0);
+            spr_draw(SPR_SHIP_90, FLIP_X, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_90, hiwater, FLIP_X, SHIP_OFF, 0);
+                spr_draw(SPR_THRUST_90, FLIP_X, SHIP_OFF, 0, hiwater);
             }
             break;
 

src/sprites.h

@@ -32,6 +32,8 @@ enum SPRITES {
     SPR_LIGHT,
     SPR_DARK,
     SPR_SHOT,
+    SPR_HEALTH,
+    SPR_POWER,
 
     SPRITE_COUNT
 };
@@ -53,7 +55,7 @@ enum SPRITE_ROT {
 };
 
 void spr_init(void);
-void spr_draw(enum SPRITES sprite, uint8_t *hiwater, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off);
+void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off, uint8_t *hiwater);
 void spr_ship(enum SPRITE_ROT rot, uint8_t moving, uint8_t *hiwater);
 
 #endif // __SPRITES_H__