draw score in window

Makefile

@@ -84,22 +84,25 @@ $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	$(if $(findstring _map,$<),           \
 		@echo "Converting map $<" &&  \
 		$(PNGA) $< -o $@ -spr8x8 -map -use_map_attributes -noflip \
+	,$(if $(findstring numbers,$<), \
+		@echo "Converting font $<" && \
+		$(PNGA) $< -o $@ -spr8x8 -sw 16 -sh 16 -map -no_palettes \
 	,                                     \
 		@echo "Converting tile $<" && \
 		$(PNGA) $< -o $@ -spr8x8      \
-	)
+	))
 
 $(BUILD_DIR)/%.o: %.c $(SPRITES)
 	@mkdir -p $(@D)
 	@echo Compiling $<
 	@$(LCC) $(LCCFLAGS) -c -o $@ $<
 
-$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c
+$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c $(SPRITES)
 	@mkdir -p $(@D)
 	@echo Compiling $<
 	@$(LCC) $(LCCFLAGS) -c -o $@ $<
 
-$(BUILD_DIR)/%.o: %.s
+$(BUILD_DIR)/%.o: %.s $(SPRITES)
 	@mkdir -p $(@D)
 	@echo Assembling $<
 	@$(LCC) $(LCCFLAGS) -c -o $@ $<

src/game.c

@@ -20,6 +20,7 @@
 #include <gbdk/platform.h>
 #include <gbdk/metasprites.h>
 #include <rand.h>
+#include <stdint.h>
 
 #include "maps.h"
 #include "obj.h"
@@ -43,16 +44,16 @@ static void status(uint8_t health, uint8_t power, uint8_t *hiwater) {
         switch (health >> 6) {
             case 3:
                 spr_draw(SPR_HEALTH_1 + (((health >> 6) == 3) ? ((health >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 24, hiwater);
+                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 24, 0, hiwater);
             case 2:
                 spr_draw(SPR_HEALTH_1 + (((health >> 6) == 2) ? ((health >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 16, hiwater);
+                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 16, 0, hiwater);
             case 1:
                 spr_draw(SPR_HEALTH_1 + (((health >> 6) == 1) ? ((health >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 8, hiwater);
+                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 8, 0, hiwater);
             case 0:
                 spr_draw(SPR_HEALTH_1 + (((health >> 6) == 0) ? ((health >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 0, hiwater);
+                         FLIP_X, BAR_OFFSET_X, HEALTH_OFFSET_Y - 0, 0, hiwater);
         }
     }
 
@@ -60,16 +61,16 @@ static void status(uint8_t health, uint8_t power, uint8_t *hiwater) {
         switch (power >> 6) {
             case 3:
                 spr_draw(SPR_POWER_1 + (((power >> 6) == 3) ? ((power >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 0, hiwater);
+                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 0, 0, hiwater);
             case 2:
                 spr_draw(SPR_POWER_1 + (((power >> 6) == 2) ? ((power >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 8, hiwater);
+                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 8, 0, hiwater);
             case 1:
                 spr_draw(SPR_POWER_1 + (((power >> 6) == 1) ? ((power >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 16, hiwater);
+                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 16, 0, hiwater);
             case 0:
                 spr_draw(SPR_POWER_1 + (((power >> 6) == 0) ? ((power >> 3) & 7) : 7),
-                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 24, hiwater);
+                         FLIP_X, BAR_OFFSET_X, POWER_OFFSET_Y + 24, 0, hiwater);
         }
     }
 }
@@ -104,6 +105,11 @@ int32_t game(void) {
     obj_add(SPR_SHOT_LIGHT, 32, 32, 0, 0);
     obj_add(SPR_SHOT_DARK, -32, -32, 0, 0);
 
+    win_game_load();
+    win_game_draw(score);
+    move_win(MINWNDPOSX + 0, MINWNDPOSY + DEVICE_SCREEN_PX_HEIGHT - 16);
+    SHOW_WIN;
+
     while(1) {
         key_read();
 
@@ -160,6 +166,7 @@ int32_t game(void) {
             }
         }
 
+        int32_t prev_score = score;
         int16_t damage = obj_act(&spd_x, &spd_y, &score);
         if (damage > 0) {
             if (health > damage) {
@@ -175,6 +182,10 @@ int32_t game(void) {
             }
         }
 
+        if (score != prev_score) {
+            win_game_draw(score);
+        }
+
         // adjust speed down when not moving
         if (!(acc & ACC_X)) {
             if (spd_x != 0) {

src/maps.c

@@ -23,6 +23,9 @@
 
 #include "title_map.h"
 #include "bg_map.h"
+#include "numbers.h"
+
+#define MAX_DIGITS 7
 
 void map_title(void) {
     set_bkg_palette(OAMF_CGB_PAL0, title_map_PALETTE_COUNT, title_map_palettes);
@@ -37,3 +40,49 @@ void map_game(void) {
     set_bkg_attributes(0, 0, bg_map_MAP_ATTRIBUTES_WIDTH, bg_map_MAP_ATTRIBUTES_HEIGHT, bg_map_MAP_ATTRIBUTES);
     set_bkg_tiles(0, 0, bg_map_WIDTH / bg_map_TILE_W, bg_map_HEIGHT / bg_map_TILE_H, bg_map_map);
 }
+
+static void digit(uint8_t val, uint8_t digit, uint8_t x_off) {
+    uint8_t off = val * numbers_WIDTH / numbers_TILE_W;
+    set_win_based_tiles(x_off + (digit * numbers_WIDTH / numbers_TILE_W), 0,
+                        numbers_WIDTH / numbers_TILE_W, 1,
+                        numbers_map + off, bg_map_TILE_COUNT);
+    set_win_based_tiles(x_off + (digit * numbers_WIDTH / numbers_TILE_W), 1,
+                        numbers_WIDTH / numbers_TILE_W, 1,
+                        numbers_map + off + (sizeof(numbers_map) / 2), bg_map_TILE_COUNT);
+}
+
+void win_game_load(void) {
+    set_win_data(bg_map_TILE_COUNT, numbers_TILE_COUNT, numbers_tiles);
+}
+
+void win_game_draw(int32_t score) {
+    // TODO can not set numbers larger than int16 max?!
+    //score = 32767 + 1; // wtf?!
+
+    // TODO support color switch, but how?
+
+    uint8_t is_black = 0;
+    if (score < 0) {
+        score = -score;
+        is_black = 1;
+    }
+
+    uint8_t len = 0;
+    uint8_t digits[MAX_DIGITS];
+    do {
+        digits[len++] = score % 10L;
+        score = score / 10L;
+        if (len >= MAX_DIGITS) {
+            break;
+        }
+    } while (score > 0);
+
+    // if the number was too large for our buffer don't draw anything
+    if (score > 0) {
+        return;
+    }
+
+    for (uint8_t i = 0; i < len; i++) {
+        digit(digits[len - i - 1], i, 10 - len);
+    }
+}

src/maps.h

@@ -20,7 +20,11 @@
 #ifndef __MAPS_H__
 #define __MAPS_H__
 
+#include <stdint.h>
+
 void map_title(void);
 void map_game(void);
+void win_game_load(void);
+void win_game_draw(int32_t score);
 
 #endif // __MAPS_H__

src/obj.c

@@ -202,6 +202,6 @@ void obj_draw(int16_t spd_x, int16_t spd_y, uint8_t *hiwater) {
             objs[i].active = 0;
         }
 
-        spr_draw(objs[i].sprite, FLIP_NONE, objs[i].off_x >> POS_SCALE_OBJS, objs[i].off_y >> POS_SCALE_OBJS, hiwater);
+        spr_draw(objs[i].sprite, FLIP_NONE, objs[i].off_x >> POS_SCALE_OBJS, objs[i].off_y >> POS_SCALE_OBJS, 0, hiwater);
     }
 }

src/sprite_data.c

@@ -0,0 +1,248 @@
+/*
+ * sprite_data.c
+ * Duality
+ *
+ * Copyright (C) 2025 Thomas Buck <thomas@xythobuz.de>
+ *
+ * Based on examples from gbdk-2020:
+ * https://github.com/gbdk-2020/gbdk-2020/blob/develop/gbdk-lib/examples/cross-platform/metasprites/src/metasprites.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * See <http://www.gnu.org/licenses/>.
+ */
+
+#include "sprite_data.h"
+
+#include "rockshp_0.h"
+#include "rockshp_90.h"
+#include "thrust_0.h"
+#include "thrust_90.h"
+#include "light.h"
+#include "dark.h"
+#include "shoot.h"
+#include "bar_1.h"
+#include "bar_2.h"
+#include "bar_3.h"
+#include "bar_4.h"
+#include "bar_5.h"
+#include "bar_6.h"
+#include "bar_7.h"
+#include "bar_8.h"
+
+const palette_color_t power_palettes[4] = {
+  //RGB8(  0,  0,  0), RGB8(240,  0,  0), RGB8(196,  0,  0), RGB8(116,  0,  0)
+    RGB8(  0,  0,  0), RGB8(  0,240,  0), RGB8(  0,196,  0), RGB8(  0,116,  0)
+
+};
+
+struct sprites metasprites[SPRITE_COUNT] = {
+    { // SPR_SHIP_0
+        .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
+    },
+    { // SPR_SHIP_90
+        .ms = rockshp_90_metasprites,
+        .ti = rockshp_90_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL0,
+        .cnt = rockshp_90_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_THRUST_0
+        .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
+    },
+    { // SPR_THRUST_90
+        .ms = thrust_90_metasprites,
+        .ti = thrust_90_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL1,
+        .cnt = thrust_90_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_LIGHT
+        .ms = light_metasprites,
+        .ti = light_tiles,
+        .pa = light_palettes,
+        .pa_i = OAMF_CGB_PAL2,
+        .cnt = light_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_DARK
+        .ms = dark_metasprites,
+        .ti = dark_tiles,
+        .pa = dark_palettes,
+        .pa_i = OAMF_CGB_PAL3,
+        .cnt = dark_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_SHOT
+        .ms = shoot_metasprites,
+        .ti = shoot_tiles,
+        .pa = shoot_palettes,
+        .pa_i = OAMF_CGB_PAL4,
+        .cnt = shoot_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_SHOT_LIGHT
+        .ms = shoot_metasprites,
+        .ti = shoot_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL2,
+        .cnt = shoot_TILE_COUNT,
+        .off = SPR_SHOT
+    },
+    { // SPR_SHOT_DARK
+        .ms = shoot_metasprites,
+        .ti = shoot_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL3,
+        .cnt = shoot_TILE_COUNT,
+        .off = SPR_SHOT
+    },
+    { // SPR_HEALTH_1
+        .ms = bar_1_metasprites,
+        .ti = bar_1_tiles,
+        .pa = bar_1_palettes,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_1_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_HEALTH_2
+        .ms = bar_2_metasprites,
+        .ti = bar_2_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_2_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_HEALTH_3
+        .ms = bar_3_metasprites,
+        .ti = bar_3_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_3_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_HEALTH_4
+        .ms = bar_4_metasprites,
+        .ti = bar_4_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_4_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_HEALTH_5
+        .ms = bar_5_metasprites,
+        .ti = bar_5_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_5_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_HEALTH_6
+        .ms = bar_6_metasprites,
+        .ti = bar_6_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_6_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_HEALTH_7
+        .ms = bar_7_metasprites,
+        .ti = bar_7_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_7_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_HEALTH_8
+        .ms = bar_8_metasprites,
+        .ti = bar_8_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL5,
+        .cnt = bar_8_TILE_COUNT,
+        .off = TILE_NUM_START
+    },
+    { // SPR_POWER_1
+        .ms = bar_1_metasprites,
+        .ti = bar_1_tiles,
+        .pa = power_palettes,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_1_TILE_COUNT,
+        .off = SPR_HEALTH_1
+    },
+    { // SPR_POWER_2
+        .ms = bar_2_metasprites,
+        .ti = bar_2_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_2_TILE_COUNT,
+        .off = SPR_HEALTH_2
+    },
+    { // SPR_POWER_3
+        .ms = bar_3_metasprites,
+        .ti = bar_3_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_3_TILE_COUNT,
+        .off = SPR_HEALTH_3
+    },
+    { // SPR_POWER_4
+        .ms = bar_4_metasprites,
+        .ti = bar_4_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_4_TILE_COUNT,
+        .off = SPR_HEALTH_4
+    },
+    { // SPR_POWER_5
+        .ms = bar_5_metasprites,
+        .ti = bar_5_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_5_TILE_COUNT,
+        .off = SPR_HEALTH_5
+    },
+    { // SPR_POWER_6
+        .ms = bar_6_metasprites,
+        .ti = bar_6_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_6_TILE_COUNT,
+        .off = SPR_HEALTH_6
+    },
+    { // SPR_POWER_7
+        .ms = bar_7_metasprites,
+        .ti = bar_7_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_7_TILE_COUNT,
+        .off = SPR_HEALTH_7
+    },
+    { // SPR_POWER_8
+        .ms = bar_8_metasprites,
+        .ti = bar_8_tiles,
+        .pa = NULL,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = bar_8_TILE_COUNT,
+        .off = SPR_HEALTH_8
+    }
+};

src/sprite_data.h

@@ -0,0 +1,46 @@
+/*
+ * sprite_data.h
+ * Duality
+ *
+ * Copyright (C) 2025 Thomas Buck <thomas@xythobuz.de>
+ *
+ * Based on examples from gbdk-2020:
+ * https://github.com/gbdk-2020/gbdk-2020/blob/develop/gbdk-lib/examples/cross-platform/metasprites/src/metasprites.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * See <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SPRITE__DATA_H
+#define __SPRITE__DATA_H
+
+#include <gbdk/platform.h>
+#include <gbdk/metasprites.h>
+#include <stdint.h>
+
+#include "sprites.h"
+
+// Metasprite tiles are loaded into VRAM starting at tile number 0
+#define TILE_NUM_START 0
+
+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;
+};
+
+extern struct sprites metasprites[SPRITE_COUNT];
+
+#endif // __SPRITE__DATA_H

src/sprites.c

@@ -20,247 +20,7 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
-#include <gbdk/platform.h>
-#include <gbdk/metasprites.h>
-
-#include "sprites.h"
-
-#include "rockshp_0.h"
-#include "rockshp_90.h"
-#include "thrust_0.h"
-#include "thrust_90.h"
-#include "light.h"
-#include "dark.h"
-#include "shoot.h"
-#include "bar_1.h"
-#include "bar_2.h"
-#include "bar_3.h"
-#include "bar_4.h"
-#include "bar_5.h"
-#include "bar_6.h"
-#include "bar_7.h"
-#include "bar_8.h"
-
-// Metasprite tiles are loaded into VRAM starting at tile number 0
-#define TILE_NUM_START 0
-
-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;
-};
-
-const palette_color_t power_palettes[4] = {
-  //RGB8(  0,  0,  0), RGB8(240,  0,  0), RGB8(196,  0,  0), RGB8(116,  0,  0)
-    RGB8(  0,  0,  0), RGB8(  0,240,  0), RGB8(  0,196,  0), RGB8(  0,116,  0)
-
-};
-
-static struct sprites metasprites[SPRITE_COUNT] = {
-    { // SPR_SHIP_0
-        .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
-    },
-    { // SPR_SHIP_90
-        .ms = rockshp_90_metasprites,
-        .ti = rockshp_90_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL0,
-        .cnt = rockshp_90_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_THRUST_0
-        .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
-    },
-    { // SPR_THRUST_90
-        .ms = thrust_90_metasprites,
-        .ti = thrust_90_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL1,
-        .cnt = thrust_90_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_LIGHT
-        .ms = light_metasprites,
-        .ti = light_tiles,
-        .pa = light_palettes,
-        .pa_i = OAMF_CGB_PAL2,
-        .cnt = light_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_DARK
-        .ms = dark_metasprites,
-        .ti = dark_tiles,
-        .pa = dark_palettes,
-        .pa_i = OAMF_CGB_PAL3,
-        .cnt = dark_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_SHOT
-        .ms = shoot_metasprites,
-        .ti = shoot_tiles,
-        .pa = shoot_palettes,
-        .pa_i = OAMF_CGB_PAL4,
-        .cnt = shoot_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_SHOT_LIGHT
-        .ms = shoot_metasprites,
-        .ti = shoot_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL2,
-        .cnt = shoot_TILE_COUNT,
-        .off = SPR_SHOT
-    },
-    { // SPR_SHOT_DARK
-        .ms = shoot_metasprites,
-        .ti = shoot_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL3,
-        .cnt = shoot_TILE_COUNT,
-        .off = SPR_SHOT
-    },
-    { // SPR_HEALTH_1
-        .ms = bar_1_metasprites,
-        .ti = bar_1_tiles,
-        .pa = bar_1_palettes,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_1_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_HEALTH_2
-        .ms = bar_2_metasprites,
-        .ti = bar_2_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_2_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_HEALTH_3
-        .ms = bar_3_metasprites,
-        .ti = bar_3_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_3_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_HEALTH_4
-        .ms = bar_4_metasprites,
-        .ti = bar_4_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_4_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_HEALTH_5
-        .ms = bar_5_metasprites,
-        .ti = bar_5_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_5_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_HEALTH_6
-        .ms = bar_6_metasprites,
-        .ti = bar_6_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_6_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_HEALTH_7
-        .ms = bar_7_metasprites,
-        .ti = bar_7_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_7_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_HEALTH_8
-        .ms = bar_8_metasprites,
-        .ti = bar_8_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL5,
-        .cnt = bar_8_TILE_COUNT,
-        .off = TILE_NUM_START
-    },
-    { // SPR_POWER_1
-        .ms = bar_1_metasprites,
-        .ti = bar_1_tiles,
-        .pa = power_palettes,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_1_TILE_COUNT,
-        .off = SPR_HEALTH_1
-    },
-    { // SPR_POWER_2
-        .ms = bar_2_metasprites,
-        .ti = bar_2_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_2_TILE_COUNT,
-        .off = SPR_HEALTH_2
-    },
-    { // SPR_POWER_3
-        .ms = bar_3_metasprites,
-        .ti = bar_3_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_3_TILE_COUNT,
-        .off = SPR_HEALTH_3
-    },
-    { // SPR_POWER_4
-        .ms = bar_4_metasprites,
-        .ti = bar_4_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_4_TILE_COUNT,
-        .off = SPR_HEALTH_4
-    },
-    { // SPR_POWER_5
-        .ms = bar_5_metasprites,
-        .ti = bar_5_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_5_TILE_COUNT,
-        .off = SPR_HEALTH_5
-    },
-    { // SPR_POWER_6
-        .ms = bar_6_metasprites,
-        .ti = bar_6_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_6_TILE_COUNT,
-        .off = SPR_HEALTH_6
-    },
-    { // SPR_POWER_7
-        .ms = bar_7_metasprites,
-        .ti = bar_7_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_7_TILE_COUNT,
-        .off = SPR_HEALTH_7
-    },
-    { // SPR_POWER_8
-        .ms = bar_8_metasprites,
-        .ti = bar_8_tiles,
-        .pa = NULL,
-        .pa_i = OAMF_CGB_PAL6,
-        .cnt = bar_8_TILE_COUNT,
-        .off = SPR_HEALTH_8
-    },
-};
+#include "sprite_data.h"
 
 void spr_init(void) {
     uint8_t off = TILE_NUM_START;
@@ -279,11 +39,11 @@ void spr_init(void) {
     }
 }
 
-void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off, uint8_t *hiwater) {
+void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off, uint8_t frame, uint8_t *hiwater) {
     switch (flip) {
         case FLIP_Y:
             *hiwater += move_metasprite_flipy(
-                    metasprites[sprite].ms[0], metasprites[sprite].off,
+                    metasprites[sprite].ms[frame], metasprites[sprite].off,
                     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);
@@ -291,7 +51,7 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y
 
         case FLIP_XY:
             *hiwater += move_metasprite_flipxy(
-                    metasprites[sprite].ms[0], metasprites[sprite].off,
+                    metasprites[sprite].ms[frame], metasprites[sprite].off,
                     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);
@@ -299,7 +59,7 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y
 
         case FLIP_X:
             *hiwater += move_metasprite_flipx(
-                    metasprites[sprite].ms[0], metasprites[sprite].off,
+                    metasprites[sprite].ms[frame], metasprites[sprite].off,
                     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);
@@ -308,7 +68,7 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y
         case FLIP_NONE:
         default:
             *hiwater += move_metasprite_ex(
-                    metasprites[sprite].ms[0], metasprites[sprite].off,
+                    metasprites[sprite].ms[frame], metasprites[sprite].off,
                     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);
@@ -319,30 +79,30 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y
 void spr_ship(enum SPRITE_ROT rot, uint8_t moving, uint8_t *hiwater) {
     switch (rot) {
         case ROT_0:
-            spr_draw(SPR_SHIP_0, FLIP_NONE, 0, 0, hiwater);
+            spr_draw(SPR_SHIP_0, FLIP_NONE, 0, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_0, FLIP_NONE, 0, SHIP_OFF, hiwater);
+                spr_draw(SPR_THRUST_0, FLIP_NONE, 0, SHIP_OFF, 0, hiwater);
             }
             break;
 
         case ROT_90:
-            spr_draw(SPR_SHIP_90, FLIP_NONE, 0, 0, hiwater);
+            spr_draw(SPR_SHIP_90, FLIP_NONE, 0, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_90, FLIP_NONE, -SHIP_OFF, 0, hiwater);
+                spr_draw(SPR_THRUST_90, FLIP_NONE, -SHIP_OFF, 0, 0, hiwater);
             }
             break;
 
         case ROT_180:
-            spr_draw(SPR_SHIP_0, FLIP_Y, 0, 0, hiwater);
+            spr_draw(SPR_SHIP_0, FLIP_Y, 0, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_0, FLIP_Y, 0, -SHIP_OFF, hiwater);
+                spr_draw(SPR_THRUST_0, FLIP_Y, 0, -SHIP_OFF, 0, hiwater);
             }
             break;
 
         case ROT_270:
-            spr_draw(SPR_SHIP_90, FLIP_X, 0, 0, hiwater);
+            spr_draw(SPR_SHIP_90, FLIP_X, 0, 0, 0, hiwater);
             if (moving) {
-                spr_draw(SPR_THRUST_90, FLIP_X, SHIP_OFF, 0, hiwater);
+                spr_draw(SPR_THRUST_90, FLIP_X, SHIP_OFF, 0, 0, hiwater);
             }
             break;
 

src/sprites.h

@@ -72,7 +72,7 @@ enum SPRITE_ROT {
 };
 
 void spr_init(void);
-void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off, uint8_t *hiwater);
+void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip, int8_t x_off, int8_t y_off, uint8_t frame, uint8_t *hiwater);
 void spr_ship(enum SPRITE_ROT rot, uint8_t moving, uint8_t *hiwater);
 
 #endif // __SPRITES_H__