always draw ship sprite, no bg map attributes, re-use palettes for status.

Makefile

@@ -124,7 +124,7 @@ $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	$(eval SPRFLAG = $(shell echo "$<" | sed -n 's/.*_spr\([0-9]\+\).*/\-sw \1 \-sh \1/p'))
 	$(if $(findstring _map,$<),                                                             \
 		@echo "Converting map $<" &&                                                    \
-		$(PNGA) $< -o $@ -spr8x8 -map -use_map_attributes -noflip                       \
+		$(PNGA) $< -o $@ -spr8x8 -map -noflip                                           \
 	,$(if $(findstring _fnt,$<),                                                            \
 		@echo "Converting font $<" &&                                                   \
 		$(PNGA) $< -o $@ -spr8x8 -sw 16 -sh 16 -map -noflip                             \

src/game.c

@@ -121,8 +121,8 @@ static void status(uint8_t health, uint8_t power, uint8_t *hiwater) NONBANKED {
         }
     }
 
-    spr_draw(SPR_STATUS, FLIP_NONE, BAR_OFFSET_X, HEALTH_OFFSET_Y - 24 - 9, 0, hiwater);
-    spr_draw(SPR_STATUS, FLIP_NONE, BAR_OFFSET_X, POWER_OFFSET_Y + 0 - 9, 1, hiwater);
+    spr_draw(SPR_STATUS_HEALTH, FLIP_NONE, BAR_OFFSET_X, HEALTH_OFFSET_Y - 24 - 9, 0, hiwater);
+    spr_draw(SPR_STATUS_POWER, FLIP_NONE, BAR_OFFSET_X, POWER_OFFSET_Y + 0 - 9, 1, hiwater);
 }
 
 static void show_explosion(uint16_t power) NONBANKED {
@@ -158,7 +158,6 @@ int32_t game(void) NONBANKED {
     int16_t spd_y = 0;
     enum SPRITE_ROT rot = 0;
     enum ACCELERATION prev_acc = 0xFF; // so we draw the ship on the first frame
-    uint8_t ship_hiwater = 0;
     uint16_t health = HEALTH_MAX;
     uint16_t power = POWER_MAX;
     int32_t score = 0;
@@ -331,9 +330,6 @@ int32_t game(void) NONBANKED {
             }
         }
 
-        // re-draw ship sprite when we've just rotated or are starting or stopping acceleration
-        uint8_t redraw = (acc & ACC_R) || ((prev_acc & (ACC_X | ACC_Y)) != (acc & (ACC_X | ACC_Y)));
-
         if (key_pressed(J_START)) {
             if (pause_screen()) {
                 break;
@@ -341,9 +337,6 @@ int32_t game(void) NONBANKED {
 
             // restart bg music
             snd_music(SND_GAME);
-
-            // re-draw ship sprite
-            redraw = 1;
         }
 
         pos_x = (pos_x + spd_x) & POS_MASK_BG;
@@ -359,12 +352,7 @@ int32_t game(void) NONBANKED {
             spr_draw(SPR_DEBUG_LARGE, FLIP_NONE, 0, 0, 0, &hiwater);
         }
 
-        if (redraw) {
-            spr_ship(rot, acc & (ACC_X | ACC_Y), &hiwater);
-            ship_hiwater = hiwater;
-        } else {
-            hiwater = ship_hiwater;
-        }
+        spr_ship(rot, acc & (ACC_X | ACC_Y), &hiwater);
 
         int16_t damage = obj_do(&spd_x, &spd_y, &score, &hiwater, 0);
         if (damage > 0) {

src/main.c

@@ -25,6 +25,7 @@
 
 #include "banks.h"
 #include "config.h"
+#include "gb/hardware.h"
 #include "maps.h"
 #include "obj.h"
 #include "sprites.h"
@@ -545,6 +546,7 @@ void main(void) NONBANKED {
     // "cheat" and enable double-speed CPU mode on GBC
     if (_cpu == CGB_TYPE) {
         cpu_fast();
+        LCDC_REG &= ~LCDCF_BGON;
     }
 
     conf_init();

src/maps.c

@@ -67,7 +67,17 @@ void map_title(void) NONBANKED {
     START_ROM_BANK(BANK(title_map));
         set_bkg_palette(OAMF_CGB_PAL0, title_map_PALETTE_COUNT, title_map_palettes);
         set_bkg_data(0, title_map_TILE_COUNT, title_map_tiles);
-        set_bkg_attributes(0, 0, title_map_MAP_ATTRIBUTES_WIDTH, title_map_MAP_ATTRIBUTES_HEIGHT, title_map_MAP_ATTRIBUTES);
+        if (title_map_MAP_ATTRIBUTES != NULL) {
+            set_bkg_attributes(0, 0,
+                               title_map_WIDTH / title_map_TILE_W, title_map_HEIGHT / title_map_TILE_H,
+                               title_map_MAP_ATTRIBUTES);
+        } else {
+            VBK_REG = VBK_ATTRIBUTES;
+            fill_bkg_rect(0, 0,
+                          title_map_WIDTH / title_map_TILE_W, title_map_HEIGHT / title_map_TILE_H,
+                          0x00);
+            VBK_REG = VBK_TILES;
+        }
         set_bkg_tiles(0, 0, title_map_WIDTH / title_map_TILE_W, title_map_HEIGHT / title_map_TILE_H, title_map_map);
     END_ROM_BANK();
 }
@@ -76,7 +86,17 @@ void map_game(void) NONBANKED {
     START_ROM_BANK(BANK(bg_map));
         set_bkg_palette(OAMF_CGB_PAL0, bg_map_PALETTE_COUNT, bg_map_palettes);
         set_bkg_data(0, bg_map_TILE_COUNT, bg_map_tiles);
-        set_bkg_attributes(0, 0, bg_map_MAP_ATTRIBUTES_WIDTH, bg_map_MAP_ATTRIBUTES_HEIGHT, bg_map_MAP_ATTRIBUTES);
+        if (bg_map_MAP_ATTRIBUTES != NULL) {
+            set_bkg_attributes(0, 0,
+                               bg_map_WIDTH / bg_map_TILE_W, bg_map_HEIGHT / bg_map_TILE_H,
+                               bg_map_MAP_ATTRIBUTES);
+        } else {
+            VBK_REG = VBK_ATTRIBUTES;
+            fill_bkg_rect(0, 0,
+                          bg_map_WIDTH / bg_map_TILE_W, bg_map_HEIGHT / bg_map_TILE_H,
+                          0x00);
+            VBK_REG = VBK_TILES;
+        }
         set_bkg_tiles(0, 0, bg_map_WIDTH / bg_map_TILE_W, bg_map_HEIGHT / bg_map_TILE_H, bg_map_map);
     END_ROM_BANK();
 }
@@ -103,12 +123,17 @@ void win_init(uint8_t is_splash) NONBANKED {
 static void set_win_based(uint8_t x, uint8_t y, uint8_t w, uint8_t h,
                           const uint8_t *tiles, uint8_t base_tile, uint8_t tile_bank,
                           const uint8_t *attributes, uint8_t attr_bank) NONBANKED {
-    START_ROM_BANK(attr_bank);
+    if (attributes != NULL) {
+        START_ROM_BANK(attr_bank);
+            VBK_REG = VBK_ATTRIBUTES;
+            set_win_tiles(x, y, w, h, attributes);
+        END_ROM_BANK();
+    } else {
         VBK_REG = VBK_ATTRIBUTES;
-        set_win_tiles(x, y, w, h, attributes);
-    END_ROM_BANK();
+        fill_win_rect(x, y, w, h, 0x00);
+    }
 
-    START_ROM_BANK_2(tile_bank);
+    START_ROM_BANK(tile_bank);
         VBK_REG = VBK_TILES;
         set_win_based_tiles(x, y, w, h, tiles, base_tile);
     END_ROM_BANK();

src/sprite_data.c

@@ -165,17 +165,28 @@ struct sprites metasprites[SPRITE_COUNT] = {
         .off = TILE_NUM_START,
         .bank = BANK(pause),
     },
-    { // SPR_STATUS
+    { // SPR_STATUS_HEALTH
         .ms = status_spr8_metasprites,
         .ms_n = ARR_LEN(status_spr8_metasprites),
         .ti = status_spr8_tiles,
-        .pa = status_spr8_palettes,
+        .pa = NULL,
         .pa_n = status_spr8_PALETTE_COUNT,
-        .pa_i = OAMF_CGB_PAL7 | PALETTE_DYNAMIC_LOAD_IP,
+        .pa_i = OAMF_CGB_PAL5,
         .cnt = status_spr8_TILE_COUNT,
         .off = TILE_NUM_START,
         .bank = BANK(status_spr8),
     },
+    { // SPR_STATUS_POWER
+        .ms = status_spr8_metasprites,
+        .ms_n = ARR_LEN(status_spr8_metasprites),
+        .ti = status_spr8_tiles,
+        .pa = NULL,
+        .pa_n = status_spr8_PALETTE_COUNT,
+        .pa_i = OAMF_CGB_PAL6,
+        .cnt = status_spr8_TILE_COUNT,
+        .off = SPR_STATUS_HEALTH,
+        .bank = BANK(status_spr8),
+    },
     { // SPR_DEBUG
         .ms = debug_marker_metasprites,
         .ms_n = ARR_LEN(debug_marker_metasprites),

src/sprites.h

@@ -36,7 +36,8 @@ enum SPRITES {
     SPR_POWER,
     SPR_EXPL,
     SPR_PAUSE,
-    SPR_STATUS,
+    SPR_STATUS_HEALTH,
+    SPR_STATUS_POWER,
     SPR_DEBUG,
     SPR_DEBUG_LARGE,