add large debug marker. properly keep coordinates in range.

Makefile

@@ -101,21 +101,16 @@ flash: $(BIN)
 
 $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	@mkdir -p $(@D)
+	$(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                       \
 	,$(if $(findstring _fnt,$<),                                                            \
 		@echo "Converting font $<" &&                                                   \
 		$(PNGA) $< -o $@ -spr8x8 -sw 16 -sh 16 -map -noflip                             \
-	,$(if $(findstring _spr8,$<),                                                           \
+	,$(if $(findstring _spr,$<),                                                            \
 		@echo "Converting 8x8 sprite $<" &&                                             \
-		$(PNGA) $< -o $@ -spr8x8 -sw 8 -sh 8 -noflip                                    \
-	,$(if $(findstring _spr16,$<),                                                          \
-		@echo "Converting 16x16 sprite $<" &&                                           \
-		$(PNGA) $< -o $@ -spr8x8 -sw 16 -sh 16 -noflip                                  \
-	,$(if $(findstring _spr24,$<),                                                          \
-		@echo "Converting 24x24 sprite $<" &&                                           \
-		$(PNGA) $< -o $@ -spr8x8 -sw 24 -sh 24 -noflip                                  \
+		$(PNGA) $< -o $@ -spr8x8 $(SPRFLAG) -noflip                                     \
 	,$(if $(findstring pause,$<),                                                           \
 		@echo "Converting 40x16 sprite $<" &&                                           \
 		$(PNGA) $< -o $@ -spr8x8 -sw 40 -sh 16 -noflip                                  \
@@ -125,7 +120,7 @@ $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	,                                                                                       \
 		@echo "Converting tile $<" &&                                                   \
 		$(PNGA) $< -o $@ -spr8x8                                                        \
-	)))))))
+	)))))
 
 $(BUILD_DIR)/%.o: %.c $(SPRITES)
 	@mkdir -p $(@D)

src/game.c

@@ -321,6 +321,7 @@ int32_t game(void) NONBANKED {
 
         if (debug_flags & DBG_MARKER) {
             spr_draw(SPR_DEBUG, FLIP_NONE, 0, 0, 0, &hiwater);
+            spr_draw(SPR_DEBUG_LARGE, FLIP_NONE, 0, 0, 0, &hiwater);
         }
 
         if (redraw) {

src/game.h

@@ -30,7 +30,8 @@
 #define SPEED_MAX_IDLE 16
 
 #define POS_SCALE_OBJS 5
-#define POS_MASK_OBJS 0x1FFF
+#define POS_OBJS_MAX (INT16_MAX >> (8 - POS_SCALE_OBJS))
+#define POS_OBJS_MIN (-(INT16_MAX >> (8 - POS_SCALE_OBJS)) - 1)
 
 #define POS_SCALE_BG 6
 #define POS_MASK_BG 0x3FFF

src/main.c

@@ -37,7 +37,7 @@
 #include "main.h"
 
 #ifdef DEBUG
-enum debug_flag debug_flags = DBG_MENU;
+enum debug_flag debug_flags = DBG_MENU | DBG_MARKER;
 #else
 enum debug_flag debug_flags = 0;
 #endif

src/obj.c

@@ -59,10 +59,10 @@
 #define GRAVITY_RANGE (24 << POS_SCALE_OBJS)
 #define GRAVITY_SHIFT (POS_SCALE_OBJS + 4)
 
-#define DAMAGE_RANGE (16 << POS_SCALE_OBJS)
+#define DAMAGE_RANGE (14 << POS_SCALE_OBJS)
 #define DAMAGE_INC 5
 
-#define HEALTH_RANGE (18 << POS_SCALE_OBJS)
+#define HEALTH_RANGE (12 << POS_SCALE_OBJS)
 #define HEALTH_INC HEALTH_MAX
 
 #define PICKUP_SMALL_RANGE (12 << POS_SCALE_OBJS)
@@ -126,8 +126,19 @@ int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *
         }
 
         // move objects by their speed and compensate for movement of the background / ship
-        objs[i].off_x = (objs[i].off_x + objs[i].spd_x - spd_x) & POS_MASK_OBJS;
-        objs[i].off_y = (objs[i].off_y + objs[i].spd_y - spd_y) & POS_MASK_OBJS;
+        objs[i].off_x = objs[i].off_x + objs[i].spd_x - spd_x;
+        objs[i].off_y = objs[i].off_y + objs[i].spd_y - spd_y;
+
+        if (objs[i].off_x > POS_OBJS_MAX) {
+            objs[i].off_x -= POS_OBJS_MAX - POS_OBJS_MIN + 1;
+        } else if (objs[i].off_x < POS_OBJS_MIN) {
+            objs[i].off_x += POS_OBJS_MAX - POS_OBJS_MIN + 1;
+        }
+        if (objs[i].off_y > POS_OBJS_MAX) {
+            objs[i].off_y -= POS_OBJS_MAX - POS_OBJS_MIN + 1;
+        } else if (objs[i].off_y < POS_OBJS_MIN) {
+            objs[i].off_y += POS_OBJS_MAX - POS_OBJS_MIN + 1;
+        }
 
         // only update travel time if we're actually moving
         if ((objs[i].spd_x != 0) || (objs[i].spd_y != 0)) {

src/sprite_data.c

@@ -30,6 +30,7 @@
 #include "expl_spr16.h"
 #include "pause.h"
 #include "debug_marker.h"
+#include "debug_marker_spr32.h"
 
 BANKREF(power_palettes)
 
@@ -174,4 +175,15 @@ struct sprites metasprites[SPRITE_COUNT] = {
         .off = TILE_NUM_START,
         .bank = BANK(debug_marker),
     },
+    { // SPR_DEBUG_LARGE
+        .ms = debug_marker_spr32_metasprites,
+        .ms_n = ARR_LEN(debug_marker_spr32_metasprites),
+        .ti = debug_marker_spr32_tiles,
+        .pa = debug_marker_spr32_palettes,
+        .pa_n = debug_marker_spr32_PALETTE_COUNT,
+        .pa_i = OAMF_CGB_PAL7 | PALETTE_DYNAMIC_LOAD_IP,
+        .cnt = debug_marker_spr32_TILE_COUNT,
+        .off = TILE_NUM_START,
+        .bank = BANK(debug_marker_spr32),
+    },
 };

src/sprites.h

@@ -37,6 +37,7 @@ enum SPRITES {
     SPR_EXPL,
     SPR_PAUSE,
     SPR_DEBUG,
+    SPR_DEBUG_LARGE,
 
     SPRITE_COUNT
 };