allow cycling through sprites

src/main.c

@@ -1,8 +1,17 @@
+/*
+ * main.c
+ * Duality
+ */
+
 #include <gbdk/platform.h>
 #include <gbdk/metasprites.h>
 
-#include "rockshp.h"
 #include "bg_map.h"
+#include "rockshp.h"
+#include "thrustG.h"
+#include "light.h"
+#include "dark.h"
+#include "shoot.h"
 
 #define TILE_WIDTH          8
 #define TILE_HEIGHT         8
@@ -30,26 +39,50 @@ uint8_t joyp = 0, old_joyp = 0;
 #define KEY_DOWN(KEY) (joyp & (KEY))
 #define KEY_PRESSED(KEY) ((joyp ^ old_joyp) & joyp & (KEY))
 
-const palette_color_t gray_pal[4] = {   RGB8(255,255,255),
-                                        RGB8(170,170,170),
-                                        RGB8(85,85,85),
-                                        RGB8(0,0,0) };
-const palette_color_t pink_pal[4] = {   RGB8(255,255,255),
-                                        RGB8(255,0,255),
-                                        RGB8(170,0,170),
-                                        RGB8(85,0,85) };
-const palette_color_t cyan_pal[4] = {   RGB8(255,255,255),
-                                        RGB8(85,255,255),
-                                        RGB8(0,170,170),
-                                        RGB8(0,85,85) };
-const palette_color_t green_pal[4] = {  RGB8(255,255,255),
-                                        RGB8(170,255,170),
-                                        RGB8(0,170,0),
-                                        RGB8(0,85,0) };
-
-const uint8_t pattern[] = {0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x02,0x02,0x01,0x01};
+struct sprites {
+    const metasprite_t * const * ms;
+    const uint8_t * ti;
+    const palette_color_t * pa;
+    uint8_t cnt;
+    uint8_t off;
+};
+
+struct sprites metasprites[] = {
+    {
+        .ms = rockshp_metasprites,
+        .ti = rockshp_tiles,
+        .pa = rockshp_palettes,
+        .cnt = rockshp_TILE_COUNT,
+        .off = TILE_NUM_START
+    }, {
+        .ms = thrustG_metasprites,
+        .ti = thrustG_tiles,
+        .pa = thrustG_palettes,
+        .cnt = thrustG_TILE_COUNT,
+        .off = TILE_NUM_START
+    }, {
+        .ms = light_metasprites,
+        .ti = light_tiles,
+        .pa = light_palettes,
+        .cnt = light_TILE_COUNT,
+        .off = TILE_NUM_START
+    }, {
+        .ms = dark_metasprites,
+        .ti = dark_tiles,
+        .pa = dark_palettes,
+        .cnt = dark_TILE_COUNT,
+        .off = TILE_NUM_START
+    }, {
+        .ms = shoot_metasprites,
+        .ti = shoot_tiles,
+        .pa = shoot_palettes,
+        .cnt = shoot_TILE_COUNT,
+        .off = TILE_NUM_START
+    }
+};
 
 void main(void) {
+    disable_interrupts();
     DISPLAY_OFF;
 
     set_default_palette();
@@ -60,24 +93,21 @@ void main(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);
 
+    // metasprites
+    uint8_t off = TILE_NUM_START;
+    for (int i = 0; i < (sizeof(metasprites) / sizeof(metasprites[0])); i++) {
+        metasprites[i].off = off;
+        off += metasprites[i].cnt;
 
-    set_sprite_palette(OAMF_CGB_PAL0, 1, rockshp_palettes); //gray_pal);
-    set_sprite_palette(OAMF_CGB_PAL1, 1, pink_pal);
-    set_sprite_palette(OAMF_CGB_PAL2, 1, cyan_pal);
-    set_sprite_palette(OAMF_CGB_PAL3, 1, green_pal);
-
-    size_t i;
-    num_tiles = sizeof(rockshp_tiles) >> 4;
-    for(i = 0; i < num_tiles; i++)
-    {
-        //set_tile(i + get_tile_offset(0, 0), rockshp_tiles + (i << 4));
-        set_sprite_data(i, 1, rockshp_tiles + (i << 4));
+        set_sprite_palette(OAMF_CGB_PAL0 + i, 1, metasprites[i].pa);
+        set_sprite_data(metasprites[i].off, metasprites[i].cnt, metasprites[i].ti);
     }
 
     SHOW_BKG;
     SHOW_SPRITES;
     SPRITES_8x8;
     DISPLAY_ON;
+    enable_interrupts();
 
     // Set initial position to the center of the screen, zero out speed
     PosX = (DEVICE_SCREEN_PX_WIDTH / 2) << 4;
@@ -113,12 +143,13 @@ void main(void) {
 
         // Press B button to cycle through metasprite animations
         if (KEY_PRESSED(J_B)) {
-            idx++; if (idx >= (sizeof(rockshp_metasprites) >> 1)) idx = 0;
+            idx++;
+            if (idx >= (sizeof(metasprites) / sizeof(metasprites[0]))) idx = 0;
         }
 
         // Press A button to cycle metasprite through Normal/Flip-Y/Flip-XY/Flip-X and sub-pals
         if (KEY_PRESSED(J_A)) {
-            rot++; rot &= 0xF;
+            rot++; rot &= 0x3;
         }
 
         PosX += SpdX, PosY += SpdY;
@@ -132,36 +163,35 @@ void main(void) {
         // In this example they are called every frame to simplify the example code
 
         // If not hidden the move and apply rotation to the metasprite
-        uint8_t subpal = rot >> 2;
         switch (rot & 0x3) {
             case 1:
-                hiwater += move_metasprite_flipy( rockshp_metasprites[idx],
-                                                  TILE_NUM_START,
-                                                  subpal,
+                hiwater += move_metasprite_flipy( metasprites[idx].ms[0],
+                                                  metasprites[idx].off,
+                                                  idx,
                                                   hiwater,
                                                   DEVICE_SPRITE_PX_OFFSET_X + (PosX >> 4),
                                                   DEVICE_SPRITE_PX_OFFSET_Y + (PosY >> 4));
                 break;
             case 2:
-                hiwater += move_metasprite_flipxy(rockshp_metasprites[idx],
-                                                  TILE_NUM_START,
-                                                  subpal,
+                hiwater += move_metasprite_flipxy(metasprites[idx].ms[0],
+                                                  metasprites[idx].off,
+                                                  idx,
                                                   hiwater,
                                                   DEVICE_SPRITE_PX_OFFSET_X + (PosX >> 4),
                                                   DEVICE_SPRITE_PX_OFFSET_Y + (PosY >> 4));
                 break;
             case 3:
-                hiwater += move_metasprite_flipx( rockshp_metasprites[idx],
-                                                  TILE_NUM_START,
-                                                  subpal,
+                hiwater += move_metasprite_flipx( metasprites[idx].ms[0],
+                                                  metasprites[idx].off,
+                                                  idx,
                                                   hiwater,
                                                   DEVICE_SPRITE_PX_OFFSET_X + (PosX >> 4),
                                                   DEVICE_SPRITE_PX_OFFSET_Y + (PosY >> 4));
                 break;
             default:
-                hiwater += move_metasprite_ex(    rockshp_metasprites[idx],
-                                                  TILE_NUM_START,
-                                                  subpal,
+                hiwater += move_metasprite_ex(    metasprites[idx].ms[0],
+                                                  metasprites[idx].off,
+                                                  idx,
                                                   hiwater,
                                                   DEVICE_SPRITE_PX_OFFSET_X + (PosX >> 4),
                                                   DEVICE_SPRITE_PX_OFFSET_Y + (PosY >> 4));