add no-fuel and fast-movement debug flags

src/config.h

@@ -33,7 +33,10 @@ enum debug_flag {
     DBG_MARKER = (1 << 1),
     DBG_GOD_MODE = (1 << 2),
     DBG_NO_OBJ = (1 << 3),
+    DBG_NO_FUEL = (1 << 4),
+    DBG_FAST = (1 << 5),
 
+    // TODO could be something other than flags
     DBG_CLEAR_SCORE = (1 << 6),
     DBG_ZERO_SCORE = (1 << 7),
 };

src/game.c

@@ -44,6 +44,7 @@
 #define SPEED_MAX_ACC 23
 #define SPEED_MAX_ACC_DIAG 16
 #define SPEED_MAX_IDLE 16
+#define SPEED_MAX_DBG 256
 
 #define POWER_MAX 0x1FF
 #define POWER_SHIFT 1
@@ -187,70 +188,120 @@ int32_t game(void) NONBANKED {
         }
 
         if (key_down(J_A) && (power > 0)) {
-            if (power >= POWER_DEC) {
-                power -= POWER_DEC;
-            } else {
-                power = 0;
+            if (!(conf_get()->debug_flags & DBG_NO_FUEL)) {
+                if (power >= POWER_DEC) {
+                    power -= POWER_DEC;
+                } else {
+                    power = 0;
+                }
             }
 
             switch (rot) {
                 case ROT_0:
                     spd_y -= SPEED_INC;
-                    if (spd_y < -SPEED_MAX_ACC) spd_y = -SPEED_MAX_ACC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_y < -SPEED_MAX_ACC) spd_y = -SPEED_MAX_ACC;
+                    } else {
+                        if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
+                    }
                     acc |= ACC_Y;
                     break;
 
                 case ROT_45:
                     spd_y -= SPEED_INC;
-                    if (spd_y < -SPEED_MAX_ACC_DIAG) spd_y += SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_y < -SPEED_MAX_ACC_DIAG) spd_y = -SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
+                    }
                     acc |= ACC_Y;
                     spd_x += SPEED_INC;
-                    if (spd_x > SPEED_MAX_ACC_DIAG) spd_x -= SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_x > SPEED_MAX_ACC_DIAG) spd_x = SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
+                    }
                     acc |= ACC_X;
                     break;
 
                 case ROT_90:
                     spd_x += SPEED_INC;
-                    if (spd_x > SPEED_MAX_ACC) spd_x = SPEED_MAX_ACC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_x > SPEED_MAX_ACC) spd_x = SPEED_MAX_ACC;
+                    } else {
+                        if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
+                    }
                     acc |= ACC_X;
                     break;
 
                 case ROT_135:
                     spd_x += SPEED_INC;
-                    if (spd_x > SPEED_MAX_ACC_DIAG) spd_x -= SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_x > SPEED_MAX_ACC_DIAG) spd_x = SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_x > SPEED_MAX_DBG) spd_x = SPEED_MAX_DBG;
+                    }
                     acc |= ACC_X;
                     spd_y += SPEED_INC;
-                    if (spd_y > SPEED_MAX_ACC_DIAG) spd_y -= SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_y > SPEED_MAX_ACC_DIAG) spd_y = SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
+                    }
                     acc |= ACC_Y;
                     break;
 
                 case ROT_180:
                     spd_y += SPEED_INC;
-                    if (spd_y > SPEED_MAX_ACC) spd_y = SPEED_MAX_ACC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_y > SPEED_MAX_ACC) spd_y = SPEED_MAX_ACC;
+                    } else {
+                        if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
+                    }
                     acc |= ACC_Y;
                     break;
 
                 case ROT_225:
                     spd_y += SPEED_INC;
-                    if (spd_y > SPEED_MAX_ACC_DIAG) spd_y -= SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_y > SPEED_MAX_ACC_DIAG) spd_y = SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_y > SPEED_MAX_DBG) spd_y = SPEED_MAX_DBG;
+                    }
                     acc |= ACC_Y;
                     spd_x -= SPEED_INC;
-                    if (spd_x < -SPEED_MAX_ACC_DIAG) spd_x += SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_x < -SPEED_MAX_ACC_DIAG) spd_x = -SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
+                    }
                     acc |= ACC_X;
                     break;
 
                 case ROT_270:
                     spd_x -= SPEED_INC;
-                    if (spd_x < -SPEED_MAX_ACC) spd_x = -SPEED_MAX_ACC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_x < -SPEED_MAX_ACC) spd_x = -SPEED_MAX_ACC;
+                    } else {
+                        if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
+                    }
                     acc |= ACC_X;
                     break;
 
                 case ROT_315:
                     spd_x -= SPEED_INC;
-                    if (spd_x < -SPEED_MAX_ACC_DIAG) spd_x += SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_x < -SPEED_MAX_ACC_DIAG) spd_x = -SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_x < -SPEED_MAX_DBG) spd_x = -SPEED_MAX_DBG;
+                    }
                     acc |= ACC_X;
                     spd_y -= SPEED_INC;
-                    if (spd_y < -SPEED_MAX_ACC_DIAG) spd_y += SPEED_DEC;
+                    if (!(conf_get()->debug_flags & DBG_FAST)) {
+                        if (spd_y < -SPEED_MAX_ACC_DIAG) spd_y = -SPEED_MAX_ACC_DIAG;
+                    } else {
+                        if (spd_y < -SPEED_MAX_DBG) spd_y = -SPEED_MAX_DBG;
+                    }
                     acc |= ACC_Y;
                     break;
 
@@ -268,14 +319,22 @@ int32_t game(void) NONBANKED {
         // adjust speed down when not moving
         if (!(acc & ACC_X)) {
             if (spd_x != 0) {
-                if (spd_x > SPEED_MAX_IDLE) spd_x -= SPEED_DEC;
-                else if (spd_x < -SPEED_MAX_IDLE) spd_x += SPEED_DEC;
+                if (!(conf_get()->debug_flags & DBG_FAST)) {
+                    if (spd_x > SPEED_MAX_IDLE) spd_x -= SPEED_DEC;
+                    else if (spd_x < -SPEED_MAX_IDLE) spd_x += SPEED_DEC;
+                } else {
+                    spd_x = 0;
+                }
             }
         }
         if (!(acc & ACC_Y)) {
             if (spd_y != 0) {
-                if (spd_y > SPEED_MAX_IDLE) spd_y -= SPEED_DEC;
-                else if (spd_y < -SPEED_MAX_IDLE) spd_y += SPEED_DEC;
+                if (!(conf_get()->debug_flags & DBG_FAST)) {
+                    if (spd_y > SPEED_MAX_IDLE) spd_y -= SPEED_DEC;
+                    else if (spd_y < -SPEED_MAX_IDLE) spd_y += SPEED_DEC;
+                } else {
+                    spd_y = 0;
+                }
             }
         }
 

src/main.c

@@ -54,10 +54,12 @@ const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT] = {
     { .name = "marker",   .flag = DBG_MARKER,      .max = 1 }, // 0
     { .name = "invuln",   .flag = DBG_GOD_MODE,    .max = 1 }, // 1
     { .name = "no-spawn", .flag = DBG_NO_OBJ,      .max = 1 }, // 2
-    { .name = "music",    .flag = DBG_NONE,        .max = SND_COUNT }, // 3
-    { .name = "sfx-test", .flag = DBG_NONE,        .max = SFX_COUNT }, // 4
-    { .name = "cl score", .flag = DBG_CLEAR_SCORE, .max = 1 }, // 5
-    { .name = "0 scores", .flag = DBG_ZERO_SCORE,  .max = 1 }, // 6
+    { .name = "no-fuel",  .flag = DBG_NO_FUEL,     .max = 1 }, // 3
+    { .name = "fastmove", .flag = DBG_FAST,        .max = 1 }, // 4
+    { .name = "music",    .flag = DBG_NONE,        .max = SND_COUNT }, // 5
+    { .name = "sfx-test", .flag = DBG_NONE,        .max = SFX_COUNT }, // 6
+    { .name = "cl score", .flag = DBG_CLEAR_SCORE, .max = 1 }, // 7
+    { .name = "0 scores", .flag = DBG_ZERO_SCORE,  .max = 1 }, // 8
 };
 
 static void highscore(uint8_t is_black) NONBANKED {
@@ -405,13 +407,13 @@ static void splash(void) NONBANKED {
                     snd_music(SND_MENU);
                 }
 
-                if (switch_special && (debug_menu_index == 3)) {
+                if (switch_special && (debug_menu_index == 5)) {
                     snd_music_off();
                     if (debug_special_value > 0) {
                         snd_music(debug_special_value - 1);
                     }
                     snd_note_off();
-                } else if ((switch_special || (!sample_running())) && (debug_menu_index == 4)) {
+                } else if ((switch_special || (!sample_running())) && (debug_menu_index == 6)) {
                     if (debug_special_value > 0) {
                         sample_play(debug_special_value - 1);
                     }

src/main.h

@@ -48,7 +48,7 @@ extern const struct conf_entry conf_entries[CONF_ENTRY_COUNT];
 extern uint8_t debug_menu_index;
 extern uint8_t debug_special_value;
 
-#define DEBUG_ENTRY_COUNT 7
+#define DEBUG_ENTRY_COUNT 9
 extern const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT];
 
 #endif // __MAIN_H__

src/maps.c

@@ -43,13 +43,9 @@ static_assert(bg_map_HEIGHT == 256, "bg_map needs to be 256x256");
 #define camera_max_x ((bg_map_mapWidth - DEVICE_SCREEN_WIDTH) * 8)
 #define camera_max_y ((bg_map_mapHeight - DEVICE_SCREEN_HEIGHT) * 8)
 
-#define set_bkg_sub_attr(x, y, w, h, attr, map_w) \
-    if (attr)                                     \
-        set_bkg_submap_attributes(x, y, w, h, attr, map_w)
-
-#define set_bkg_sub(x, y, w, h, map, attr, map_w) \
-    set_bkg_submap(x, y, w, h, map, map_w);       \
-    set_bkg_sub_attr(x, y, w, h, attr, map_w)
+#define MAP_FLIP_NONE 0x00
+#define MAP_FLIP_X 0x01 //(0x20 | 0x01)
+#define MAP_FLIP_Y 0x02 //(0x40 | 0x02)
 
 // current unscaled ship position
 static uint16_t abs_x, abs_y;
@@ -90,6 +86,29 @@ void map_title(void) NONBANKED {
     move_bkg(0, 0);
 }
 
+static inline void set_bkg_sub_attr(uint8_t x, uint8_t y,
+                                    uint8_t w, uint8_t h,
+                                    const uint8_t *attr,
+                                    uint8_t attr_val,
+                                    uint8_t map_w) {
+    if (attr) {
+        set_bkg_submap_attributes(x, y, w, h, attr, map_w);
+    } else {
+        VBK_REG = VBK_ATTRIBUTES;
+        fill_bkg_rect(x, y, w, h, attr_val);
+        VBK_REG = VBK_TILES;
+    }
+}
+
+static inline void set_bkg_sub(uint8_t x, uint8_t y,
+                               uint8_t w, uint8_t h,
+                               const uint8_t *map, const uint8_t *attr,
+                               uint8_t attr_val,
+                               uint8_t map_w) {
+    set_bkg_submap(x, y, w, h, map, map_w);
+    set_bkg_sub_attr(x, y, w, h, attr, attr_val, map_w);
+}
+
 void map_game(void) NONBANKED {
     START_ROM_BANK(BANK(bg_map)) {
 
@@ -135,7 +154,7 @@ void map_game(void) NONBANKED {
         set_bkg_sub(map_pos_x, map_pos_y,
                     MIN(DEVICE_SCREEN_WIDTH + 1u, bg_map_mapWidth - map_pos_x),
                     MIN(DEVICE_SCREEN_HEIGHT + 1u, bg_map_mapHeight - map_pos_y),
-                    bg_map_map, bg_map_MAP_ATTRIBUTES, bg_map_mapWidth);
+                    bg_map_map, bg_map_MAP_ATTRIBUTES, MAP_FLIP_NONE, bg_map_mapWidth);
 
 #endif // WRAP_BG
 
@@ -143,12 +162,22 @@ void map_game(void) NONBANKED {
 }
 
 void map_move(int16_t delta_x, int16_t delta_y) NONBANKED {
+    // TODO
+    if ((delta_x < 0) && (camera_x == 0)) delta_x = 0;
+    if ((delta_x > 0) && (camera_x >= camera_max_x)) delta_x = 0;
+    if ((delta_y < 0) && (camera_y == 0)) delta_y = 0;
+    if ((delta_y > 0) && (camera_y >= camera_max_y)) delta_y = 0;
+
     abs_x += delta_x;
     abs_y += delta_y;
 
     camera_x = abs_x >> POS_SCALE_BG;
     camera_y = abs_y >> POS_SCALE_BG;
 
+    // TODO
+    if (camera_x > camera_max_x) camera_x = camera_max_x;
+    if (camera_y > camera_max_y) camera_y = camera_max_y;
+
     // update hardware scroll position
     move_bkg(camera_x, camera_y);
 
@@ -164,11 +193,11 @@ void map_move(int16_t delta_x, int16_t delta_y) NONBANKED {
             if (camera_y < old_camera_y) {
                 set_bkg_sub(map_pos_x, map_pos_y,
                             MIN(DEVICE_SCREEN_WIDTH + 1, bg_map_mapWidth - map_pos_x), 1,
-                            bg_map_map, bg_map_MAP_ATTRIBUTES, bg_map_mapWidth);
+                            bg_map_map, bg_map_MAP_ATTRIBUTES, MAP_FLIP_Y, bg_map_mapWidth);
             } else if ((bg_map_mapHeight - DEVICE_SCREEN_HEIGHT) > map_pos_y) {
                 set_bkg_sub(map_pos_x, map_pos_y + DEVICE_SCREEN_HEIGHT,
                             MIN(DEVICE_SCREEN_WIDTH + 1, bg_map_mapWidth - map_pos_x), 1,
-                            bg_map_map, bg_map_MAP_ATTRIBUTES, bg_map_mapWidth);
+                            bg_map_map, bg_map_MAP_ATTRIBUTES, MAP_FLIP_NONE, bg_map_mapWidth);
             }
             old_map_pos_y = map_pos_y;
         }
@@ -178,11 +207,11 @@ void map_move(int16_t delta_x, int16_t delta_y) NONBANKED {
             if (camera_x < old_camera_x) {
                 set_bkg_sub(map_pos_x, map_pos_y,
                             1, MIN(DEVICE_SCREEN_HEIGHT + 1, bg_map_mapHeight - map_pos_y),
-                            bg_map_map, bg_map_MAP_ATTRIBUTES, bg_map_mapWidth);
+                            bg_map_map, bg_map_MAP_ATTRIBUTES, MAP_FLIP_X, bg_map_mapWidth);
             } else if ((bg_map_mapWidth - DEVICE_SCREEN_WIDTH) > map_pos_x) {
                 set_bkg_sub(map_pos_x + DEVICE_SCREEN_WIDTH, map_pos_y,
                             1, MIN(DEVICE_SCREEN_HEIGHT + 1, bg_map_mapHeight - map_pos_y),
-                            bg_map_map, bg_map_MAP_ATTRIBUTES, bg_map_mapWidth);
+                            bg_map_map, bg_map_MAP_ATTRIBUTES, MAP_FLIP_NONE, bg_map_mapWidth);
             }
             old_map_pos_x = map_pos_x;
         }

src/window.c

@@ -279,16 +279,15 @@ void win_debug(void) BANKED {
                   title_map_WIDTH / title_map_TILE_W, title_map_HEIGHT / title_map_TILE_H,
                   title_map_map, 0, BANK(title_map), title_map_MAP_ATTRIBUTES, BANK(title_map));
 
-    // TODO paging when more options added
-    static_assert(DEBUG_ENTRY_COUNT <= 8, "too many debug menu entries");
-    uint8_t off = (10 - DEBUG_ENTRY_COUNT) / 2;
+    // TODO prettier pagination
+    uint8_t off = (10 - (DEBUG_ENTRY_COUNT - debug_menu_index)) / 2;
 
     str_center("Debug Menu", 0, 0);
 
-    for (uint8_t i = 0; (i < DEBUG_ENTRY_COUNT) && (i < 8); i++) {
+    for (uint8_t i = debug_menu_index; (i < DEBUG_ENTRY_COUNT) && (i < (7 + debug_menu_index)); i++) {
         char name_buff[ENTRY_NAME_LEN + 2 + 1] = {0};
         uint8_t n_len = get_debug(name_buff, i);
-        str(name_buff, (LINE_WIDTH - n_len) * 2, (i * 2) + 3 + off, (debug_menu_index == i) ? 1 : 0);
+        str(name_buff, (LINE_WIDTH - n_len) * 2, ((i - debug_menu_index) * 2) + 3 + off, (debug_menu_index == i) ? 1 : 0);
     }
 }
 
@@ -316,12 +315,12 @@ void win_conf(void) BANKED {
                   title_map_map, 0, BANK(title_map), title_map_MAP_ATTRIBUTES, BANK(title_map));
 
     // TODO paging when more options added
-    static_assert(CONF_ENTRY_COUNT <= 8, "too many conf menu entries");
+    static_assert(CONF_ENTRY_COUNT <= 7, "too many conf menu entries");
     uint8_t off = (10 - CONF_ENTRY_COUNT) / 2;
 
     str_center("Conf Menu", 0, 0);
 
-    for (uint8_t i = 0; (i < CONF_ENTRY_COUNT) && (i < 8); i++) {
+    for (uint8_t i = 0; (i < CONF_ENTRY_COUNT) && (i < 7); i++) {
         char name_buff[ENTRY_NAME_LEN + 2 + 1] = {0};
         uint8_t n_len = get_conf(name_buff, i);
         str(name_buff, (LINE_WIDTH - n_len) * 2, (i * 2) + 3 + off, (debug_menu_index == i) ? 1 : 0);