add second color to pause text and flip between them

Makefile

@@ -117,13 +117,16 @@ $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	,$(if $(findstring _spr24,$<),                                                          \
 		@echo "Converting 24x24 sprite $<" &&                                           \
 		$(PNGA) $< -o $@ -spr8x8 -sw 24 -sh 24 -noflip                                  \
+	,$(if $(findstring pause,$<),                                                           \
+		@echo "Converting 40x16 sprite $<" &&                                           \
+		$(PNGA) $< -o $@ -spr8x8 -sw 40 -sh 16 -noflip                                  \
 	,$(if $(findstring _sgb,$<),                                                            \
 		@echo "Converting sgb border $<" &&                                             \
 		$(PNGA) $< -o $@ -map -bpp 4 -max_palettes 4 -pack_mode sgb -use_map_attributes \
 	,                                                                                       \
 		@echo "Converting tile $<" &&                                                   \
 		$(PNGA) $< -o $@ -spr8x8                                                        \
-	))))))
+	)))))))
 
 $(BUILD_DIR)/%.o: %.c $(SPRITES)
 	@mkdir -p $(@D)

src/game.c

@@ -39,19 +39,26 @@ enum ACCELERATION {
 #define BAR_OFFSET_X (4 - 80)
 #define HEALTH_OFFSET_Y -16
 #define POWER_OFFSET_Y 16
+#define PAUSE_BLINK_FRAMES 32
 
 static uint8_t pause_screen(void) {
-    uint8_t hiwater = SPR_NUM_START;
-    spr_draw(SPR_PAUSE, FLIP_NONE, 0, 0, 0, &hiwater);
-    hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
+    uint8_t n = 0;
 
     while (1) {
         key_read();
+
         if (key_pressed(J_START)) {
             break;
         } else if (key_pressed(J_SELECT)) {
             return 1;
         }
+
+        n = (n + 1) & (PAUSE_BLINK_FRAMES - 1);
+
+        uint8_t hiwater = SPR_NUM_START;
+        spr_draw(SPR_PAUSE, FLIP_NONE, 0, 0, (n < (PAUSE_BLINK_FRAMES / 2)) ? 0 : 1, &hiwater);
+        hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
+
         vsync();
     }
 

src/maps.c

@@ -81,9 +81,11 @@ void win_init(uint8_t is_splash) NONBANKED {
 
     SWITCH_ROM(BANK(numbers_fnt));
     set_bkg_palette(OAMF_CGB_PAL0 + bg_map_PALETTE_COUNT, numbers_fnt_PALETTE_COUNT, numbers_fnt_palettes);
-    set_bkg_palette(OAMF_CGB_PAL0 + bg_map_PALETTE_COUNT + numbers_fnt_PALETTE_COUNT, numbers_fnt_PALETTE_COUNT, num_pal_inv);
     set_win_data(fnt_off, numbers_fnt_TILE_COUNT, numbers_fnt_tiles);
 
+    SWITCH_ROM(BANK(maps));
+    set_bkg_palette(OAMF_CGB_PAL0 + bg_map_PALETTE_COUNT + numbers_fnt_PALETTE_COUNT, numbers_fnt_PALETTE_COUNT, num_pal_inv);
+
     if (is_splash) {
         SWITCH_ROM(BANK(text_fnt));
         set_win_data(fnt_off + numbers_fnt_TILE_COUNT, text_fnt_TILE_COUNT, text_fnt_tiles);

src/sprite_data.c

@@ -32,6 +32,20 @@
 
 BANKREF(power_palettes)
 
+/*
+ * OCP0: Rocketship (1)
+ * OCP1: Rocketship (2)
+ * OCP2: Light
+ * OCP3: Dark
+ * OCP4: Shot
+ * OCP5: Health
+ * OCP6: Power
+ * OCP7: Pause
+ *
+ * Explosion uses OCP0 to OCP3 at end of game.
+ * Pause is flipped in-place for animating the pause screen colors.
+ */
+
 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)
@@ -143,7 +157,7 @@ struct sprites metasprites[SPRITE_COUNT] = {
         .ti = pause_tiles,
         .pa = pause_palettes,
         .pa_n = pause_PALETTE_COUNT,
-        .pa_i = OAMF_CGB_PAL7,
+        .pa_i = OAMF_CGB_PAL7 | PALETTE_DYNAMIC_LOAD_IP,
         .cnt = pause_TILE_COUNT,
         .off = TILE_NUM_START,
         .bank = BANK(pause),

src/sprite_data.h

@@ -32,8 +32,11 @@
 // Metasprite tiles are loaded into VRAM starting at tile number 0
 #define TILE_NUM_START 0
 
-#define PALETTE_DYNAMIC_LOAD 0xF0
+#define PALETTE_PRELOAD 0x00
+#define PALETTE_DYNAMIC_LOAD 0x10
+#define PALETTE_DYNAMIC_LOAD_IP 0x20
 #define PALETTE_NO_FLAGS 0x0F
+#define PALETTE_ALL_FLAGS 0xF0
 
 #define ARR_LEN(x) (sizeof(x) / sizeof(x[0]))
 

src/sprites.c

@@ -45,7 +45,7 @@ void spr_init_pal(void) NONBANKED {
             SWITCH_ROM(metasprites[i].bank);
         }
 
-        if ((metasprites[i].pa != NULL) && (!(metasprites[i].pa_i & 0xF0))) {
+        if ((metasprites[i].pa != NULL) && ((metasprites[i].pa_i & PALETTE_ALL_FLAGS) == PALETTE_PRELOAD)) {
             set_sprite_palette(metasprites[i].pa_i, metasprites[i].pa_n, metasprites[i].pa);
         }
     }
@@ -60,21 +60,29 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip,
         frame = 0;
     }
 
-    if (metasprites[sprite].pa_i & PALETTE_DYNAMIC_LOAD) {
+    uint8_t pa_off = 0;
+
+    if ((metasprites[sprite].pa_i & PALETTE_ALL_FLAGS) == PALETTE_DYNAMIC_LOAD) {
         uint8_t pa_i = frame;
         if (pa_i >= metasprites[sprite].pa_n) {
             pa_i = 0;
         }
 
-        // used for explosion. just overwrite our fist four palettes. we dont need them at the end of the game.
-        set_sprite_palette((metasprites[sprite].pa_i & PALETTE_NO_FLAGS) + pa_i, 1, metasprites[sprite].pa + (pa_i * 1));
+        set_sprite_palette((metasprites[sprite].pa_i & PALETTE_NO_FLAGS) + pa_i, 1, metasprites[sprite].pa + (pa_i * 4));
+    } else if ((metasprites[sprite].pa_i & PALETTE_ALL_FLAGS) == PALETTE_DYNAMIC_LOAD_IP) {
+        pa_off = frame;
+        if (pa_off >= metasprites[sprite].pa_n) {
+            pa_off = 0;
+        }
+
+        set_sprite_palette((metasprites[sprite].pa_i & PALETTE_NO_FLAGS), 1, metasprites[sprite].pa + (pa_off * 4));
     }
 
     switch (flip) {
         case FLIP_Y:
             *hiwater += move_metasprite_flipy(
                     metasprites[sprite].ms[frame], metasprites[sprite].off,
-                    metasprites[sprite].pa_i & PALETTE_NO_FLAGS, *hiwater,
+                    (metasprites[sprite].pa_i - pa_off) & PALETTE_NO_FLAGS, *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;
@@ -82,7 +90,7 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip,
         case FLIP_XY:
             *hiwater += move_metasprite_flipxy(
                     metasprites[sprite].ms[frame], metasprites[sprite].off,
-                    metasprites[sprite].pa_i & PALETTE_NO_FLAGS, *hiwater,
+                    (metasprites[sprite].pa_i - pa_off) & PALETTE_NO_FLAGS, *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;
@@ -90,7 +98,7 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip,
         case FLIP_X:
             *hiwater += move_metasprite_flipx(
                     metasprites[sprite].ms[frame], metasprites[sprite].off,
-                    metasprites[sprite].pa_i & PALETTE_NO_FLAGS, *hiwater,
+                    (metasprites[sprite].pa_i - pa_off) & PALETTE_NO_FLAGS, *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;
@@ -99,7 +107,7 @@ void spr_draw(enum SPRITES sprite, enum SPRITE_FLIP flip,
         default:
             *hiwater += move_metasprite_ex(
                     metasprites[sprite].ms[frame], metasprites[sprite].off,
-                    metasprites[sprite].pa_i & PALETTE_NO_FLAGS, *hiwater,
+                    (metasprites[sprite].pa_i - pa_off) & PALETTE_NO_FLAGS, *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;