add animation to splash screen

Makefile

@@ -62,9 +62,8 @@ FLASHFLAGS := --mode dmg --action flash-rom
 
 $(info BUILD_TYPE is $(BUILD_TYPE))
 
-# TODO this is not working. why?!
-#DEPS=$(OBJS:%.o=%.d)
-#-include $(DEPS)
+DEPS=$(OBJS:%.o=%.d)
+-include $(DEPS)
 
 .PHONY: all run sgb_run flash clean compile_commands.json usage $(GIT)
 .PRECIOUS: $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h

src/game.c

@@ -109,10 +109,6 @@ static void show_explosion(uint16_t power) NONBANKED {
     for (uint8_t n = 0; n < (4 * 4); n++) {
         uint8_t hiwater = SPR_NUM_START;
         spr_draw(SPR_EXPL, FLIP_NONE, 0, 0, n >> 2, &hiwater);
-
-        // can't draw objects, we used the pallettes for the explosion
-        //obj_draw(0, 0, &hiwater);
-
         status(0, power >> POWER_SHIFT, &hiwater);
         hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
         vsync();

src/main.c

@@ -47,7 +47,6 @@ uint8_t debug_menu_index = 0;
 BANKREF(main)
 
 const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT] = {
-    { .name = "menu", .flag = DBG_MENU },
     { .name = "marker", .flag = DBG_MARKER },
     { .name = "invuln", .flag = DBG_GOD_MODE },
     { .name = "cl score", .flag = DBG_CLEAR_SCORE },
@@ -108,18 +107,78 @@ static void splash_win(void) NONBANKED {
         // initially show the top 1 scores
         int32_t low = score_lowest(0).score;
         int32_t high = score_highest(0).score;
+        win_splash_draw(-low, high);
 
-        // only show on splash if they fit
-        if ((low >= -99999) && (high <= 99999)) {
-            win_splash_draw(-low, high);
-        }
-
-        move_win(MINWNDPOSX, MINWNDPOSY + DEVICE_SCREEN_PX_HEIGHT - 16);
+        move_win(MINWNDPOSX, MINWNDPOSY + DEVICE_SCREEN_PX_HEIGHT - (8 * 4));
     }
 
     SHOW_WIN;
 }
 
+static void splash_anim(uint8_t *hiwater) NONBANKED {
+    static uint8_t frame = 0;
+    static uint8_t state = 0;
+
+    if (++frame >= 60) {
+        frame = 0;
+        if (++state >= 10) {
+            state = 0;
+        }
+    }
+
+    int16_t spd_off_x = 0;
+    int16_t spd_off_y = 0;
+    int32_t score = 0;
+    obj_do(&spd_off_x, &spd_off_y, &score, hiwater);
+
+    switch (state) {
+        case 0:
+        case 2:
+            spr_draw(SPR_SHIP, FLIP_NONE, -4, -42 - 1, 4, hiwater);
+            break;
+
+        case 1:
+            spr_draw(SPR_SHIP, FLIP_NONE, -4, -42 - 1, 4, hiwater);
+            if (frame == 0) {
+                obj_add(SPR_SHOT, SHIP_OFF, -42, SHOT_SPEED, 0);
+                snd_shot();
+            }
+            break;
+
+        case 3:
+            if (frame == 30) {
+                obj_add(SPR_LIGHT, 42, -42, 0, 0);
+            }
+            spr_draw(SPR_SHIP, FLIP_NONE, -1, -42 + 4, 0, hiwater);
+            break;
+
+        case 8:
+            if (frame == 30) {
+                obj_add(SPR_DARK, -42, -42, 0, 0);
+            }
+            spr_draw(SPR_SHIP, FLIP_NONE, -1, -42 + 4, 0, hiwater);
+            break;
+
+        case 4:
+        case 9:
+            spr_draw(SPR_SHIP, FLIP_NONE, -1, -42 + 4, 0, hiwater);
+            break;
+
+        case 5:
+        case 7:
+            spr_draw(SPR_SHIP, FLIP_X, 4, -42, 4, hiwater);
+            break;
+
+        case 6:
+            spr_draw(SPR_SHIP, FLIP_X, 4, -42, 4, hiwater);
+            if (frame == 0) {
+                obj_add(SPR_SHOT, -SHIP_OFF, -42, -SHOT_SPEED, 0);
+                snd_shot();
+            }
+            break;
+    }
+}
+
 static void splash(void) NONBANKED {
     disable_interrupts();
     DISPLAY_OFF;
@@ -186,6 +245,9 @@ static void splash(void) NONBANKED {
                     SWITCH_ROM(BANK(main));
                     debug_flags ^= debug_entries[debug_menu_index].flag;
                     splash_win();
+                } else if (key_pressed(J_B)) {
+                    debug_flags &= ~DBG_MENU;
+                    splash_win();
                 }
             }
         }
@@ -193,7 +255,7 @@ static void splash(void) NONBANKED {
         uint8_t hiwater = SPR_NUM_START;
 
         if (!(debug_flags & DBG_MENU)) {
-            obj_draw(&hiwater);
+            splash_anim(&hiwater);
         }
 
         hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);

src/main.h

@@ -47,7 +47,7 @@ BANKREF_EXTERN(main)
 extern enum debug_flag debug_flags;
 extern uint8_t debug_menu_index;
 
-#define DEBUG_ENTRY_COUNT 4
+#define DEBUG_ENTRY_COUNT 3
 
 extern const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT];
 

src/maps.c

@@ -209,11 +209,17 @@ static void fill_win(uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint8_t tile, u
 
 void win_splash_draw(int32_t lowest, int32_t highest) NONBANKED {
     // reuse full black and white tiles at 0 and 1 from splash bg
-    fill_win(0, 0, 10, 2, 0, 0x00);
-    fill_win(10, 0, 10, 2, 1, 0x00);
+    fill_win(0, 0, 10, 4, 0, 0x00);
+    fill_win(10, 0, 10, 4, 1, 0x00);
 
-    number(lowest, 0, 0, 1);
-    number(highest, 0xFE, 0, 0);
+    // only show on splash if they fit
+    if ((lowest <= 99999) && (highest <= 99999)) {
+        number(lowest, 0, 0, 1);
+        number(highest, 0xFE, 0, 0);
+
+        str("top", 0, 2, 1);
+        str("score", 10, 2, 0);
+    }
 }
 
 void win_score_clear(uint8_t is_black) NONBANKED {

src/obj.c

@@ -248,13 +248,3 @@ int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *
 
     return damage;
 }
-
-void obj_draw(uint8_t *hiwater) NONBANKED {
-    for (uint8_t i = 0; i < MAX_OBJ; i++) {
-        if (!objs[i].active) {
-            continue;
-        }
-
-        spr_draw(objs[i].sprite, FLIP_NONE, objs[i].off_x >> POS_SCALE_OBJS, objs[i].off_y >> POS_SCALE_OBJS, 0, hiwater);
-    }
-}

src/obj.h

@@ -31,6 +31,5 @@ enum OBJ_STATE {
 void obj_init(void);
 enum OBJ_STATE obj_add(enum SPRITES sprite, int16_t off_x, int16_t off_y, int16_t spd_x, int16_t spd_y);
 int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *hiwater);
-void obj_draw(uint8_t *hiwater);
 
 #endif // __OBJ_H__