Browse Source

debug marker in center of screen. tweak sprite positions.

Thomas B 1 month ago
parent
commit
0e0afb6c62
6 changed files with 23 additions and 6 deletions
  1. BIN
      artwork/cart_label.xcf
  2. BIN
      data/debug_marker.png
  3. 8
    4
      src/game.c
  4. 12
    0
      src/sprite_data.c
  5. 2
    2
      src/sprites.c
  6. 1
    0
      src/sprites.h

BIN
artwork/cart_label.xcf View File


BIN
data/debug_marker.png View File


+ 8
- 4
src/game.c View File

@@ -267,7 +267,7 @@ int32_t game(void) NONBANKED {
267 267
                     break;
268 268
 
269 269
                 case ROT_45:
270
-                    ret = obj_add(SPR_SHOT, SHIP_OFF / 2, -SHIP_OFF / 2, spd_x + SHOT_SPEED, spd_y - SHOT_SPEED);
270
+                    ret = obj_add(SPR_SHOT, SHIP_OFF / 2 + 3, -SHIP_OFF / 2 - 2, spd_x + SHOT_SPEED, spd_y - SHOT_SPEED);
271 271
                     break;
272 272
 
273 273
                 case ROT_90:
@@ -275,7 +275,7 @@ int32_t game(void) NONBANKED {
275 275
                     break;
276 276
 
277 277
                 case ROT_135:
278
-                    ret = obj_add(SPR_SHOT, SHIP_OFF / 2, SHIP_OFF / 2, spd_x + SHOT_SPEED, spd_y + SHOT_SPEED);
278
+                    ret = obj_add(SPR_SHOT, SHIP_OFF / 2 + 3, SHIP_OFF / 2 + 2, spd_x + SHOT_SPEED, spd_y + SHOT_SPEED);
279 279
                     break;
280 280
 
281 281
                 case ROT_180:
@@ -283,7 +283,7 @@ int32_t game(void) NONBANKED {
283 283
                     break;
284 284
 
285 285
                 case ROT_225:
286
-                    ret = obj_add(SPR_SHOT, -SHIP_OFF / 2, SHIP_OFF / 2, spd_x - SHOT_SPEED, spd_y + SHOT_SPEED);
286
+                    ret = obj_add(SPR_SHOT, -SHIP_OFF / 2 - 3, SHIP_OFF / 2 + 2, spd_x - SHOT_SPEED, spd_y + SHOT_SPEED);
287 287
                     break;
288 288
 
289 289
                 case ROT_270:
@@ -291,7 +291,7 @@ int32_t game(void) NONBANKED {
291 291
                     break;
292 292
 
293 293
                 case ROT_315:
294
-                    ret = obj_add(SPR_SHOT, -SHIP_OFF / 2, -SHIP_OFF / 2, spd_x - SHOT_SPEED, spd_y - SHOT_SPEED);
294
+                    ret = obj_add(SPR_SHOT, -SHIP_OFF / 2 - 3, -SHIP_OFF / 2 - 2, spd_x - SHOT_SPEED, spd_y - SHOT_SPEED);
295 295
                     break;
296 296
 
297 297
                 default:
@@ -321,6 +321,10 @@ int32_t game(void) NONBANKED {
321 321
 
322 322
         uint8_t hiwater = SPR_NUM_START;
323 323
 
324
+#ifdef DEBUG
325
+        spr_draw(SPR_DEBUG, FLIP_NONE, 0, 0, 0, &hiwater);
326
+#endif
327
+
324 328
         if (redraw) {
325 329
             spr_ship(rot, acc & (ACC_X | ACC_Y), &hiwater);
326 330
             ship_hiwater = hiwater;

+ 12
- 0
src/sprite_data.c View File

@@ -29,6 +29,7 @@
29 29
 #include "bar_spr8.h"
30 30
 #include "expl_spr16.h"
31 31
 #include "pause.h"
32
+#include "debug_marker.h"
32 33
 
33 34
 BANKREF(power_palettes)
34 35
 
@@ -162,4 +163,15 @@ struct sprites metasprites[SPRITE_COUNT] = {
162 163
         .off = TILE_NUM_START,
163 164
         .bank = BANK(pause),
164 165
     },
166
+    { // SPR_DEBUG
167
+        .ms = debug_marker_metasprites,
168
+        .ms_n = ARR_LEN(debug_marker_metasprites),
169
+        .ti = debug_marker_tiles,
170
+        .pa = debug_marker_palettes,
171
+        .pa_n = debug_marker_PALETTE_COUNT,
172
+        .pa_i = OAMF_CGB_PAL7 | PALETTE_DYNAMIC_LOAD_IP,
173
+        .cnt = debug_marker_TILE_COUNT,
174
+        .off = TILE_NUM_START,
175
+        .bank = BANK(debug_marker),
176
+    },
165 177
 };

+ 2
- 2
src/sprites.c View File

@@ -133,7 +133,7 @@ void spr_ship(enum SPRITE_ROT rot, uint8_t moving, uint8_t *hiwater) NONBANKED {
133 133
             break;
134 134
 
135 135
         case ROT_180:
136
-            spr_draw(SPR_SHIP, FLIP_Y, -1, -4, moving ? 1 : 0, hiwater);
136
+            spr_draw(SPR_SHIP, FLIP_Y, 0, -4, moving ? 1 : 0, hiwater);
137 137
             break;
138 138
 
139 139
         case ROT_225:
@@ -141,7 +141,7 @@ void spr_ship(enum SPRITE_ROT rot, uint8_t moving, uint8_t *hiwater) NONBANKED {
141 141
             break;
142 142
 
143 143
         case ROT_270:
144
-            spr_draw(SPR_SHIP, FLIP_X, 4, -1, moving ? 5 : 4, hiwater);
144
+            spr_draw(SPR_SHIP, FLIP_X, 4, 0, moving ? 5 : 4, hiwater);
145 145
             break;
146 146
 
147 147
         case ROT_315:

+ 1
- 0
src/sprites.h View File

@@ -36,6 +36,7 @@ enum SPRITES {
36 36
     SPR_POWER,
37 37
     SPR_EXPL,
38 38
     SPR_PAUSE,
39
+    SPR_DEBUG,
39 40
 
40 41
     SPRITE_COUNT
41 42
 };

Loading…
Cancel
Save